diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/atm/lec.c | 2 | ||||
-rw-r--r-- | net/core/netpoll.c | 2 | ||||
-rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 2 | ||||
-rw-r--r-- | net/sunrpc/xprtsock.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/net/atm/lec.c b/net/atm/lec.c index 181d70c73d7..96a4a4bd230 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c | |||
@@ -1608,7 +1608,7 @@ static void lec_arp_destroy(struct lec_priv *priv) | |||
1608 | struct lec_arp_table *entry; | 1608 | struct lec_arp_table *entry; |
1609 | int i; | 1609 | int i; |
1610 | 1610 | ||
1611 | cancel_rearming_delayed_work(&priv->lec_arp_work); | 1611 | cancel_delayed_work_sync(&priv->lec_arp_work); |
1612 | 1612 | ||
1613 | /* | 1613 | /* |
1614 | * Remove all entries | 1614 | * Remove all entries |
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 4e98ffac3af..d2910947a3a 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c | |||
@@ -925,7 +925,7 @@ void __netpoll_cleanup(struct netpoll *np) | |||
925 | 925 | ||
926 | skb_queue_purge(&npinfo->arp_tx); | 926 | skb_queue_purge(&npinfo->arp_tx); |
927 | skb_queue_purge(&npinfo->txq); | 927 | skb_queue_purge(&npinfo->txq); |
928 | cancel_rearming_delayed_work(&npinfo->tx_work); | 928 | cancel_delayed_work_sync(&npinfo->tx_work); |
929 | 929 | ||
930 | /* clean after last, unfinished work */ | 930 | /* clean after last, unfinished work */ |
931 | __skb_queue_purge(&npinfo->txq); | 931 | __skb_queue_purge(&npinfo->txq); |
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 5f5daa30b0a..96334e0fd04 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c | |||
@@ -3432,7 +3432,7 @@ void ip_vs_control_cleanup(void) | |||
3432 | { | 3432 | { |
3433 | EnterFunction(2); | 3433 | EnterFunction(2); |
3434 | ip_vs_trash_cleanup(); | 3434 | ip_vs_trash_cleanup(); |
3435 | cancel_rearming_delayed_work(&defense_work); | 3435 | cancel_delayed_work_sync(&defense_work); |
3436 | cancel_work_sync(&defense_work.work); | 3436 | cancel_work_sync(&defense_work.work); |
3437 | ip_vs_kill_estimator(&ip_vs_stats); | 3437 | ip_vs_kill_estimator(&ip_vs_stats); |
3438 | unregister_sysctl_table(sysctl_header); | 3438 | unregister_sysctl_table(sysctl_header); |
diff --git a/net/sunrpc/xprtsock.c b/net/sunrpc/xprtsock.c index dfcab5ac65a..96549df836e 100644 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c | |||
@@ -770,7 +770,7 @@ static void xs_destroy(struct rpc_xprt *xprt) | |||
770 | 770 | ||
771 | dprintk("RPC: xs_destroy xprt %p\n", xprt); | 771 | dprintk("RPC: xs_destroy xprt %p\n", xprt); |
772 | 772 | ||
773 | cancel_rearming_delayed_work(&transport->connect_worker); | 773 | cancel_delayed_work_sync(&transport->connect_worker); |
774 | 774 | ||
775 | xs_close(xprt); | 775 | xs_close(xprt); |
776 | xs_free_peer_addresses(xprt); | 776 | xs_free_peer_addresses(xprt); |