From 92695cea538ebc1ec2491470e25d56956e96f6f9 Mon Sep 17 00:00:00 2001 From: Jarek Poplawski Date: Thu, 28 Jun 2007 22:11:47 -0700 Subject: [PATCH] --- yaml --- r: 58108 b: refs/heads/master c: 17200811cf539b9107a99a39bf71ba3567966285 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/core/netpoll.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 990262d1a337..dcaa878498c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 25243633c29b72c4edd5fe9cfcbd76aa5eef8b36 +refs/heads/master: 17200811cf539b9107a99a39bf71ba3567966285 diff --git a/trunk/net/core/netpoll.c b/trunk/net/core/netpoll.c index f8e74e511ce6..cf40ff91ac01 100644 --- a/trunk/net/core/netpoll.c +++ b/trunk/net/core/netpoll.c @@ -72,7 +72,8 @@ static void queue_process(struct work_struct *work) netif_tx_unlock(dev); local_irq_restore(flags); - schedule_delayed_work(&npinfo->tx_work, HZ/10); + if (atomic_read(&npinfo->refcnt)) + schedule_delayed_work(&npinfo->tx_work, HZ/10); return; } netif_tx_unlock(dev); @@ -785,9 +786,15 @@ void netpoll_cleanup(struct netpoll *np) if (atomic_dec_and_test(&npinfo->refcnt)) { skb_queue_purge(&npinfo->arp_tx); skb_queue_purge(&npinfo->txq); - cancel_rearming_delayed_work(&npinfo->tx_work); + cancel_delayed_work(&npinfo->tx_work); flush_scheduled_work(); + /* clean after last, unfinished work */ + if (!skb_queue_empty(&npinfo->txq)) { + struct sk_buff *skb; + skb = __skb_dequeue(&npinfo->txq); + kfree_skb(skb); + } kfree(npinfo); } }