aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yjwei@cn.fujitsu.com>2008-08-03 21:15:59 -0700
committerDavid S. Miller <davem@davemloft.net>2008-08-03 21:15:59 -0700
commit283d07ac201ee9f8aa6dc6f7519436b48760baff (patch)
tree73587f8b3a2ad3c2f7b5eb188edbd63577c7f638
parentf880374c2fe37aad3fa62253a4bc125d7a933aad (diff)
downloadkernel_samsung_crespo-283d07ac201ee9f8aa6dc6f7519436b48760baff.zip
kernel_samsung_crespo-283d07ac201ee9f8aa6dc6f7519436b48760baff.tar.gz
kernel_samsung_crespo-283d07ac201ee9f8aa6dc6f7519436b48760baff.tar.bz2
ipv6: Do not drop packet if skb->local_df is set to true
The old code will drop IPv6 packet if ipfragok is not set, since ipfragok is obsoleted, will be instead by used skb->local_df, so this check must be changed to skb->local_df. This patch fix this problem and not drop packet if skb->local_df is set to true. Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com> Acked-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/ipv6/ip6_output.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index a027003..a4402de 100644
--- a/net/ipv6/ip6_output.c
+++ b/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,