diff options
| author | Thomas Falcon | 2017-05-26 16:30:31 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-05-26 21:32:45 +0200 |
| commit | 10f7621588b86d181a167c1535d0754eb5a58ba8 (patch) | |
| tree | d4944cf1fffd65419a4c7e2d15d36d27e84c3ebd /drivers/net | |
| parent | ibmvnic: Send gratuitous arp on reset (diff) | |
| download | kernel-qcow2-linux-10f7621588b86d181a167c1535d0754eb5a58ba8.tar.gz kernel-qcow2-linux-10f7621588b86d181a167c1535d0754eb5a58ba8.tar.xz kernel-qcow2-linux-10f7621588b86d181a167c1535d0754eb5a58ba8.zip | |
ibmvnic: Fix cleanup of SKB's on driver close
A race condition occurs when closing the driver. Free'ing of skb's
can race between the close routine and ibmvnic_tx_interrupt. To fix
this we move the claenup of tx pools during close to after the
sub-CRQ interrupts are disabled.
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/ibm/ibmvnic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index 465a8fafd95b..0f705e68755f 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -804,7 +804,6 @@ static int __ibmvnic_close(struct net_device *netdev) adapter->state = VNIC_CLOSING; netif_tx_stop_all_queues(netdev); ibmvnic_napi_disable(adapter); - clean_tx_pools(adapter); if (adapter->tx_scrq) { for (i = 0; i < adapter->req_tx_queues; i++) @@ -833,6 +832,7 @@ static int __ibmvnic_close(struct net_device *netdev) } } + clean_tx_pools(adapter); adapter->state = VNIC_CLOSED; return rc; } |