From 7d2eb18616958e60ead83f70102b7d7179038efa Mon Sep 17 00:00:00 2001 From: Wei Yongjun Date: Sun, 3 Aug 2008 21:15:59 -0700 Subject: [PATCH] --- yaml --- r: 107729 b: refs/heads/master c: 283d07ac201ee9f8aa6dc6f7519436b48760baff h: refs/heads/master i: 107727: f8c53955eec9d8171134ffaf0601acc0f2d96582 v: v3 --- [refs] | 2 +- trunk/net/ipv6/ip6_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 61b2d7151b88..39f689ece63f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f880374c2fe37aad3fa62253a4bc125d7a933aad +refs/heads/master: 283d07ac201ee9f8aa6dc6f7519436b48760baff diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c index a027003d69a4..a4402de425d9 100644 --- a/trunk/net/ipv6/ip6_output.c +++ b/trunk/net/ipv6/ip6_output.c @@ -269,7 +269,7 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl, skb->mark = sk->sk_mark; mtu = dst_mtu(dst); - if ((skb->len <= mtu) || ipfragok || skb_is_gso(skb)) { + if ((skb->len <= mtu) || skb->local_df || skb_is_gso(skb)) { IP6_INC_STATS(ip6_dst_idev(skb->dst), IPSTATS_MIB_OUTREQUESTS); return NF_HOOK(PF_INET6, NF_INET_LOCAL_OUT, skb, NULL, dst->dev,