From 1a101a0b90cad6071a497d50c3d37253396e5682 Mon Sep 17 00:00:00 2001 From: Steffen Klassert Date: Tue, 17 Jun 2008 16:37:13 -0700 Subject: [PATCH] --- yaml --- r: 98235 b: refs/heads/master c: fe833fca2eac6b3d3ad5e35f44ad4638362f1da8 h: refs/heads/master i: 98233: dbd7675dd3234fe1d7458470f749f51b670a73f0 98231: f1296febad01f991fed434ed957141fb2cae640e v: v3 --- [refs] | 2 +- trunk/net/ipv4/xfrm4_mode_tunnel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 209dc6866bac..cfc1ba66981c 100644 --- 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 index 584e6d74e3a9..7135279f3f84 100644 --- 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);