diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-08-10 01:24:38 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-08-14 14:33:30 -0700 |
| commit | 38e6bc185d9544dfad1774b3f8902a0b061aea25 (patch) | |
| tree | 5dc41a28f9dc48095c998dfc0dcf8b970db6e1b5 /net/8021q | |
| parent | 47be03a28cc6c80e3aa2b3e8ed6d960ff0c5c0af (diff) | |
| download | linux-3.10-38e6bc185d9544dfad1774b3f8902a0b061aea25.tar.gz linux-3.10-38e6bc185d9544dfad1774b3f8902a0b061aea25.tar.bz2 linux-3.10-38e6bc185d9544dfad1774b3f8902a0b061aea25.zip | |
netpoll: make __netpoll_cleanup non-block
Like the previous patch, slave_disable_netpoll() and __netpoll_cleanup()
may be called with read_lock() held too, so we should make them
non-block, by moving the cleanup and kfree() to call_rcu_bh() callbacks.
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_dev.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/8021q/vlan_dev.c b/net/8021q/vlan_dev.c index ee4ae0944ce..b65623f9066 100644 --- a/net/8021q/vlan_dev.c +++ b/net/8021q/vlan_dev.c @@ -704,11 +704,7 @@ static void vlan_dev_netpoll_cleanup(struct net_device *dev) info->netpoll = NULL; - /* Wait for transmitting packets to finish before freeing. */ - synchronize_rcu_bh(); - - __netpoll_cleanup(netpoll); - kfree(netpoll); + __netpoll_free_rcu(netpoll); } #endif /* CONFIG_NET_POLL_CONTROLLER */ |