---

yaml --- r: 98235 b: refs/heads/master c: fe833fc h: refs/heads/master i: 98233: dbd7675 98231: f1296fe v: v3
git-mirror · Jun 17, 2008 · 1a101a0 · 1a101a0
1 parent 7753ab6
commit 1a101a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a56b8f81580761c65e4d8d0c04ac1cb7a788bdf1
+refs/heads/master: fe833fca2eac6b3d3ad5e35f44ad4638362f1da8
diff --git a/trunk/net/ipv4/xfrm4_mode_tunnel.c b/trunk/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) ?
-			    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);