From 5b5d996d4ef0dd61a67e80d33786062277eb290b Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Thu, 31 Jul 2008 20:46:47 -0700
Subject: [PATCH] --- yaml --- r: 107352 b: refs/heads/master c:
 77e2f14f71d68d05945f1d30ca55b5194d6ab1ce h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a9977a352248..8523e8f47cf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bc4768eb081a67642c0c44c34ea597c273bdedcb
+refs/heads/master: 77e2f14f71d68d05945f1d30ca55b5194d6ab1ce
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index 6811901e6b1e..a027003d69a4 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/net/ipv6/ip6_output.c
@@ -236,6 +236,10 @@ 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
 	 */