From cc9397d67a466e6a77f6792cd02993225a795de5 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@linux-foundation.org>
Date: Mon, 19 Nov 2007 19:15:03 -0800
Subject: [PATCH] --- yaml --- r: 78143 b: refs/heads/master c:
 0adc9add7709f87995c003c0ccb085076afdc923 h: refs/heads/master i:   78141:
 f16367df9e9e42b39361f589eee2d96f003d879a   78139:
 0a76578338897752549d02ac4120786a06ed9742   78135:
 b040454cb99c5eab40f5d9e4dd9aa4af8e8e642b   78127:
 8ea7a42b5a102587cbbb019c943888bf536a7d10   78111:
 a50e7747a23b8145d6bcc50d8045745745a852e5   78079:
 c5974ca409757d3f69e6c5b1e44339f4b93d2169 v: v3

---
 [refs]                   | 2 +-
 trunk/net/core/netpoll.c | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 2dd5f6f96427..4f7e1e1de5bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20de20beba6e9bd2e1c83696bfefa3b16cda9a74
+refs/heads/master: 0adc9add7709f87995c003c0ccb085076afdc923
diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c
index c499b5c69bed..f63a70be3cd0 100644
--- a/trunk/net/core/netpoll.c
+++ b/trunk/net/core/netpoll.c
@@ -816,11 +816,7 @@ void netpoll_cleanup(struct netpoll *np)
 				cancel_rearming_delayed_work(&npinfo->tx_work);
 
 				/* clean after last, unfinished work */
-				if (!skb_queue_empty(&npinfo->txq)) {
-					struct sk_buff *skb;
-					skb = __skb_dequeue(&npinfo->txq);
-					kfree_skb(skb);
-				}
+				__skb_queue_purge(&npinfo->txq);
 				kfree(npinfo);
 				np->dev->npinfo = NULL;
 			}