Message ID | 4BC7CDD2.5020004@cn.fujitsu.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Shan Wei <shanwei@cn.fujitsu.com> Date: Fri, 16 Apr 2010 10:39:14 +0800 > 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> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 16c4391..f3a847e 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 */
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> --- Resend the patches with fixed cc list, no content changes. --- net/ipv6/ip6_output.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html