projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into upstream
[powerpc.git]
/
net
/
ipv6
/
exthdrs.c
diff --git
a/net/ipv6/exthdrs.c
b/net/ipv6/exthdrs.c
index
a18d425
..
9d0ee7f
100644
(file)
--- a/
net/ipv6/exthdrs.c
+++ b/
net/ipv6/exthdrs.c
@@
-179,7
+179,7
@@
static int ipv6_destopt_rcv(struct sk_buff **skbp)
static struct inet6_protocol destopt_protocol = {
.handler = ipv6_destopt_rcv,
static struct inet6_protocol destopt_protocol = {
.handler = ipv6_destopt_rcv,
- .flags = INET6_PROTO_NOPOLICY,
+ .flags = INET6_PROTO_NOPOLICY
| INET6_PROTO_GSO_EXTHDR
,
};
void __init ipv6_destopt_init(void)
};
void __init ipv6_destopt_init(void)
@@
-340,7
+340,7
@@
looped_back:
static struct inet6_protocol rthdr_protocol = {
.handler = ipv6_rthdr_rcv,
static struct inet6_protocol rthdr_protocol = {
.handler = ipv6_rthdr_rcv,
- .flags = INET6_PROTO_NOPOLICY,
+ .flags = INET6_PROTO_NOPOLICY
| INET6_PROTO_GSO_EXTHDR
,
};
void __init ipv6_rthdr_init(void)
};
void __init ipv6_rthdr_init(void)