---

yaml --- r: 78143 b: refs/heads/master c: 0adc9ad h: refs/heads/master i: 78141: f16367d 78139: 0a76578 78135: b040454 78127: 8ea7a42 78111: a50e774 78079: c5974ca v: v3
git-mirror · Jan 28, 2008 · cc9397d · cc9397d
1 parent 93d3644
commit cc9397d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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;
 			}