From 2bf0ebf7577245a2da168572b31449ab2d64c8ce Mon Sep 17 00:00:00 2001
From: Eric Dumazet <edumazet@google.com>
Date: Mon, 24 Jun 2013 06:26:00 -0700
Subject: [PATCH] --- yaml --- r: 377442 b: refs/heads/master c:
 bd8a7036c06cf15779b31a5397d4afcb12be81ea h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/linux/skbuff.h |  1 +
 trunk/net/core/skbuff.c      | 20 ++++++++++++--------
 trunk/net/ipv4/gre.c         |  2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 5710075896a2..e6a93ca38979 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b7a5db060f5e7d7f79bc45f818e08b8f244a3b8
+refs/heads/master: bd8a7036c06cf15779b31a5397d4afcb12be81ea
diff --git a/trunk/include/linux/skbuff.h b/trunk/include/linux/skbuff.h
index 9c676eae3968..dec1748cd002 100644
--- a/trunk/include/linux/skbuff.h
+++ b/trunk/include/linux/skbuff.h
@@ -627,6 +627,7 @@ static inline struct rtable *skb_rtable(const struct sk_buff *skb)
 }
 
 extern void kfree_skb(struct sk_buff *skb);
+extern void kfree_skb_list(struct sk_buff *segs);
 extern void skb_tx_error(struct sk_buff *skb);
 extern void consume_skb(struct sk_buff *skb);
 extern void	       __kfree_skb(struct sk_buff *skb);
diff --git a/trunk/net/core/skbuff.c b/trunk/net/core/skbuff.c
index cfd777bd6bd0..1c1738cc4538 100644
--- a/trunk/net/core/skbuff.c
+++ b/trunk/net/core/skbuff.c
@@ -483,15 +483,8 @@ EXPORT_SYMBOL(skb_add_rx_frag);
 
 static void skb_drop_list(struct sk_buff **listp)
 {
-	struct sk_buff *list = *listp;
-
+	kfree_skb_list(*listp);
 	*listp = NULL;
-
-	do {
-		struct sk_buff *this = list;
-		list = list->next;
-		kfree_skb(this);
-	} while (list);
 }
 
 static inline void skb_drop_fraglist(struct sk_buff *skb)
@@ -651,6 +644,17 @@ void kfree_skb(struct sk_buff *skb)
 }
 EXPORT_SYMBOL(kfree_skb);
 
+void kfree_skb_list(struct sk_buff *segs)
+{
+	while (segs) {
+		struct sk_buff *next = segs->next;
+
+		kfree_skb(segs);
+		segs = next;
+	}
+}
+EXPORT_SYMBOL(kfree_skb_list);
+
 /**
  *	skb_tx_error - report an sk_buff xmit error
  *	@skb: buffer that triggered an error
diff --git a/trunk/net/ipv4/gre.c b/trunk/net/ipv4/gre.c
index b2e805af9b87..7856d1651d05 100644
--- a/trunk/net/ipv4/gre.c
+++ b/trunk/net/ipv4/gre.c
@@ -178,7 +178,7 @@ static struct sk_buff *gre_gso_segment(struct sk_buff *skb,
 
 				err = __skb_linearize(skb);
 				if (err) {
-					kfree_skb(segs);
+					kfree_skb_list(segs);
 					segs = ERR_PTR(err);
 					goto out;
 				}