summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorShan Wei <shanwei@cn.fujitsu.com>2010-04-15 16:39:14 +0000
committerDavid S. Miller <davem@davemloft.net>2010-04-15 23:36:37 -0700
commit0eecb784942792863b77dfe11e0c7e286e92db85 (patch)
tree09e1665e1f5e6d740e673d66696018d98303c749 /net
parenta4fbf8415c462208e77251779d80dbc81914cebd (diff)
ipv6: cancel to setting local_df in ip6_xmit()
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>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/ip6_output.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
index 16c4391f952b..f3a847e3ec88 100644
--- a/net/ipv6/ip6_output.c
+++ b/net/ipv6/ip6_output.c
@@ -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
*/