projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-pull
[cascardo/linux.git]
/
net
/
ipv4
/
xfrm4_mode_tunnel.c
diff --git
a/net/ipv4/xfrm4_mode_tunnel.c
b/net/ipv4/xfrm4_mode_tunnel.c
index
584e6d7
..
7135279
100644
(file)
--- a/
net/ipv4/xfrm4_mode_tunnel.c
+++ b/
net/ipv4/xfrm4_mode_tunnel.c
@@
-52,7
+52,7
@@
static int xfrm4_mode_tunnel_output(struct xfrm_state *x, struct sk_buff *skb)
IP_ECN_clear(top_iph);
top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
IP_ECN_clear(top_iph);
top_iph->frag_off = (flags & XFRM_STATE_NOPMTUDISC) ?
-
0 : XFRM_MODE_SKB_CB(skb)->frag_off
;
+
0 : (XFRM_MODE_SKB_CB(skb)->frag_off & htons(IP_DF))
;
ip_select_ident(top_iph, dst->child, NULL);
top_iph->ttl = dst_metric(dst->child, RTAX_HOPLIMIT);
ip_select_ident(top_iph, dst->child, NULL);
top_iph->ttl = dst_metric(dst->child, RTAX_HOPLIMIT);