diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/netpoll.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index cf40ff91ac01..a0efdd7a6b37 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
| @@ -72,8 +72,7 @@ static void queue_process(struct work_struct *work) | |||
| 72 | netif_tx_unlock(dev); | 72 | netif_tx_unlock(dev); |
| 73 | local_irq_restore(flags); | 73 | local_irq_restore(flags); |
| 74 | 74 | ||
| 75 | if (atomic_read(&npinfo->refcnt)) | 75 | schedule_delayed_work(&npinfo->tx_work, HZ/10); |
| 76 | schedule_delayed_work(&npinfo->tx_work, HZ/10); | ||
| 77 | return; | 76 | return; |
| 78 | } | 77 | } |
| 79 | netif_tx_unlock(dev); | 78 | netif_tx_unlock(dev); |
| @@ -786,8 +785,7 @@ void netpoll_cleanup(struct netpoll *np) | |||
| 786 | if (atomic_dec_and_test(&npinfo->refcnt)) { | 785 | if (atomic_dec_and_test(&npinfo->refcnt)) { |
| 787 | skb_queue_purge(&npinfo->arp_tx); | 786 | skb_queue_purge(&npinfo->arp_tx); |
| 788 | skb_queue_purge(&npinfo->txq); | 787 | skb_queue_purge(&npinfo->txq); |
| 789 | cancel_delayed_work(&npinfo->tx_work); | 788 | cancel_rearming_delayed_work(&npinfo->tx_work); |
| 790 | flush_scheduled_work(); | ||
| 791 | 789 | ||
| 792 | /* clean after last, unfinished work */ | 790 | /* clean after last, unfinished work */ |
| 793 | if (!skb_queue_empty(&npinfo->txq)) { | 791 | if (!skb_queue_empty(&npinfo->txq)) { |