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 'regmap-fix-v4.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git...
[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 91771a7c802f828c33429413674c5f78ca393b6f..35feda67646494c92263cf30109432fb395fa1df 100644
(file)
--- a/
net/ipv4/xfrm4_mode_tunnel.c
+++ b/
net/ipv4/xfrm4_mode_tunnel.c
@@
-63,7
+63,7
@@
static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
top_iph->saddr = x->props.saddr.a4;
top_iph->daddr = x->id.daddr.a4;
- ip_select_ident(skb, NULL);
+ ip_select_ident(
dev_net(dst->dev),
skb, NULL);
return 0;
}