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 remote-tracking branch 'asoc/topic/wm8962' into asoc-next
[firefly-linux-kernel-4.4.55.git]
/
net
/
ipv4
/
xfrm4_mode_tunnel.c
diff --git
a/net/ipv4/xfrm4_mode_tunnel.c
b/net/ipv4/xfrm4_mode_tunnel.c
index eb1dd4d643f2f92d5a2385d0839d06a3424c545c..b5663c37f089ed0afe33115bcbfad2555b8d0f48 100644
(file)
--- a/
net/ipv4/xfrm4_mode_tunnel.c
+++ b/
net/ipv4/xfrm4_mode_tunnel.c
@@
-117,7
+117,7
@@
static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF));
- ip_select_ident(
top_iph
, dst->child, NULL);
+ ip_select_ident(
skb
, dst->child, NULL);
top_iph->ttl = ip4_dst_hoplimit(dst->child);