diff options
author | Shan Wei <shanwei@cn.fujitsu.com> | 2010-04-15 12:39:14 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-04-16 02:36:37 -0400 |
commit | 0eecb784942792863b77dfe11e0c7e286e92db85 (patch) | |
tree | 09e1665e1f5e6d740e673d66696018d98303c749 /net | |
parent | a4fbf8415c462208e77251779d80dbc81914cebd (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.c | 4 |
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, | |||
231 | skb_reset_network_header(skb); | 231 | skb_reset_network_header(skb); |
232 | hdr = ipv6_hdr(skb); | 232 | hdr = ipv6_hdr(skb); |
233 | 233 | ||
234 | /* Allow local fragmentation. */ | ||
235 | if (ipfragok) | ||
236 | skb->local_df = 1; | ||
237 | |||
238 | /* | 234 | /* |
239 | * Fill in the IPv6 header | 235 | * Fill in the IPv6 header |
240 | */ | 236 | */ |