projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v4.4.70' into linux-linaro-lsk-v4.4
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv6
/
output_core.c
diff --git
a/net/ipv6/output_core.c
b/net/ipv6/output_core.c
index 462f2a76b5c2270dba806e193a4c5bde57e14a39..1d184322a7b1eec00b1b3345b774c1fb363b9f9f 100644
(file)
--- a/
net/ipv6/output_core.c
+++ b/
net/ipv6/output_core.c
@@
-148,6
+148,8
@@
int __ip6_local_out(struct net *net, struct sock *sk, struct sk_buff *skb)
ipv6_hdr(skb)->payload_len = htons(len);
IP6CB(skb)->nhoff = offsetof(struct ipv6hdr, nexthdr);
+ skb->protocol = htons(ETH_P_IPV6);
+
return nf_hook(NFPROTO_IPV6, NF_INET_LOCAL_OUT,
net, sk, skb, NULL, skb_dst(skb)->dev,
dst_output);