From 52377a28336c11f381d3365225a77c30517a0a1a Mon Sep 17 00:00:00 2001
From: Neil Horman <nhorman@tuxdriver.com>
Date: Fri, 1 Mar 2013 07:44:08 +0000
Subject: [PATCH] --- yaml --- r: 360815 b: refs/heads/master c:
 d8c6f4b9b7848bca8babfc0ae43a50c8ab22fbb9 h: refs/heads/master i:   360813:
 95e83e5b4a983be9bc934cc86b2af85554ef9ef5   360811:
 ae54d2e3bbb29c9a3ffa358cd65e557639a3b58a   360807:
 eccfab6a26683db9d4be228e164d3cb8eb0d3daf   360799:
 4fa25a5da1ea7c0297ea37cee48b923ca0849f90 v: v3

---
 [refs]                     | 2 +-
 trunk/net/ipv4/ip_input.c  | 6 ++++--
 trunk/net/ipv6/ip6_input.c | 6 ++++--
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index d6d779bfe878..296fad56c6a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e0aab86496295efdf6c2f57eaac3497e1c721a2
+refs/heads/master: d8c6f4b9b7848bca8babfc0ae43a50c8ab22fbb9
diff --git a/trunk/net/ipv4/ip_input.c b/trunk/net/ipv4/ip_input.c
index 87abd3e2bd32..2bdf802e28e2 100644
--- a/trunk/net/ipv4/ip_input.c
+++ b/trunk/net/ipv4/ip_input.c
@@ -228,9 +228,11 @@ static int ip_local_deliver_finish(struct sk_buff *skb)
 					icmp_send(skb, ICMP_DEST_UNREACH,
 						  ICMP_PROT_UNREACH, 0);
 				}
-			} else
+				kfree_skb(skb);
+			} else {
 				IP_INC_STATS_BH(net, IPSTATS_MIB_INDELIVERS);
-			kfree_skb(skb);
+				consume_skb(skb);
+			}
 		}
 	}
  out:
diff --git a/trunk/net/ipv6/ip6_input.c b/trunk/net/ipv6/ip6_input.c
index 5b10414e619e..b1876e52091e 100644
--- a/trunk/net/ipv6/ip6_input.c
+++ b/trunk/net/ipv6/ip6_input.c
@@ -241,9 +241,11 @@ static int ip6_input_finish(struct sk_buff *skb)
 				icmpv6_send(skb, ICMPV6_PARAMPROB,
 					    ICMPV6_UNK_NEXTHDR, nhoff);
 			}
-		} else
+			kfree_skb(skb);
+		} else {
 			IP6_INC_STATS_BH(net, idev, IPSTATS_MIB_INDELIVERS);
-		kfree_skb(skb);
+			consume_skb(skb);
+		}
 	}
 	rcu_read_unlock();
 	return 0;