diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-15 13:54:59 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-12-15 13:54:59 +1100 |
| commit | a1d977c670f9cf3ea835b17f466663354d9f6aae (patch) | |
| tree | b70507450b3e401c10432397598ae9f280f2b425 /net/core/netpoll.c | |
| parent | 192808c0994a8d4aa10462bc3bb90791fba4a240 (diff) | |
| parent | 1fb0629bf64e540ab1c682ce16f25f0d8781407a (diff) | |
Merge remote branch 'workqueues/for-next'
Conflicts:
Documentation/feature-removal-schedule.txt
Diffstat (limited to 'net/core/netpoll.c')
| -rw-r--r-- | net/core/netpoll.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index ee38acb6d463..a1c93e803d02 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c @@ -924,7 +924,7 @@ void __netpoll_cleanup(struct netpoll *np) skb_queue_purge(&npinfo->arp_tx); skb_queue_purge(&npinfo->txq); - cancel_rearming_delayed_work(&npinfo->tx_work); + cancel_delayed_work_sync(&npinfo->tx_work); /* clean after last, unfinished work */ __skb_queue_purge(&npinfo->txq); |