From 2cd5cea9467333d093cba1f4f5e16b8ee85fdf5a Mon Sep 17 00:00:00 2001
From: Herbert Xu <herbert@gondor.apana.org.au>
Date: Thu, 14 Feb 2008 23:49:37 -0800
Subject: [PATCH] --- yaml --- r: 85663 b: refs/heads/master c:
 b5c15fc004ac83b7ad280acbe0fd4bbed7e2c8d4 h: refs/heads/master i:   85661:
 674d91faacf48a57699093aa4ade3bd17fcd4db9   85659:
 194ca109001aa6e79017b60a16a2c4b11db3033b   85655:
 8ae549702e126afcfb4f69449837803317394549   85647:
 0f19b7badcb3184bf99bd0686c4f0844afae9d1f   85631:
 603f8bf320ee9ef4292cc79682e58fb4d3483511 v: v3

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

diff --git a/[refs] b/[refs]
index f8fa93e8eee6..194a2f9fbb79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 073a371987f9a9806a85329eed51dca1fc52a7a0
+refs/heads/master: b5c15fc004ac83b7ad280acbe0fd4bbed7e2c8d4
diff --git a/trunk/net/ipv6/ip6_output.c b/trunk/net/ipv6/ip6_output.c
index 4e9a2fe2f12c..8b67ca07467d 100644
--- a/trunk/net/ipv6/ip6_output.c
+++ b/trunk/net/ipv6/ip6_output.c
@@ -621,7 +621,7 @@ static int ip6_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *))
 	 * or if the skb it not generated by a local socket.  (This last
 	 * check should be redundant, but it's free.)
 	 */
-	if (skb->local_df) {
+	if (!skb->local_df) {
 		skb->dev = skb->dst->dev;
 		icmpv6_send(skb, ICMPV6_PKT_TOOBIG, 0, mtu, skb->dev);
 		IP6_INC_STATS(ip6_dst_idev(skb->dst), IPSTATS_MIB_FRAGFAILS);
@@ -1421,7 +1421,7 @@ int ip6_push_pending_frames(struct sock *sk)
 	}
 
 	/* Allow local fragmentation. */
-	if (np->pmtudisc >= IPV6_PMTUDISC_DO)
+	if (np->pmtudisc < IPV6_PMTUDISC_DO)
 		skb->local_df = 1;
 
 	ipv6_addr_copy(final_dst, &fl->fl6_dst);