ipv6: cancel to setting local_df in ip6_xmit()
authorShan Wei <shanwei@cn.fujitsu.com>
Thu, 15 Apr 2010 16:39:14 +0000 (16:39 +0000)
committerDavid S. Miller <davem@davemloft.net>
Fri, 16 Apr 2010 06:36:37 +0000 (23:36 -0700)
commit f88037(sctp: Drop ipfargok in sctp_xmit function)
has droped ipfragok and set local_df value properly.

So the change of commit 77e2f1(ipv6: Fix ip6_xmit to
send fragments if ipfragok is true) is not needed.
So the patch remove them.

Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_output.c

index 16c4391f952b5a2bbe6eaa4a66ca0c7a31a86062..f3a847e3ec88aad0c9daaa887d2333b40a831376 100644 (file)
@@ -231,10 +231,6 @@ int ip6_xmit(struct sock *sk, struct sk_buff *skb, struct flowi *fl,
        skb_reset_network_header(skb);
        hdr = ipv6_hdr(skb);
 
-       /* Allow local fragmentation. */
-       if (ipfragok)
-               skb->local_df = 1;
-
        /*
         *      Fill in the IPv6 header
         */