From 2ba8d353b9ce95396250038a5843f45f658cd564 Mon Sep 17 00:00:00 2001
From: Shan Wei <shanwei@cn.fujitsu.com>
Date: Thu, 15 Apr 2010 16:39:14 +0000
Subject: [PATCH] --- yaml --- r: 194281 b: refs/heads/master c:
 0eecb784942792863b77dfe11e0c7e286e92db85 h: refs/heads/master i:   194279:
 399f210b7cefbc65ff94393f6b6f49c381163959 v: v3

---
 [refs]                      | 2 +-
 trunk/net/ipv6/ip6_output.c | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 78f315751217..c800ef0605ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a4fbf8415c462208e77251779d80dbc81914cebd
+refs/heads/master: 0eecb784942792863b77dfe11e0c7e286e92db85
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index 16c4391f952b..f3a847e3ec88 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/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
 	 */