aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2013-05-07 22:05:50 -0400
committerDavid S. Miller <davem@davemloft.net>2013-05-08 14:59:48 -0400
commitfba8755911841f9c1d49792ebce32448446e4ce2 (patch)
treea374f67a74fcf9be885df9ffb38fd4b4ea0544a1
parent3f5dffe61a2ed3bd5e02bce16488937d4a5e7c27 (diff)
be2net: disable TX in be_close()
be_close() followed by be_clear() is called as a part of cleanup in the EEH/AER flow. This patch stops TX in be_close() before cleaning/freeing up the TX queues in be_clear(). This prevents be_xmit() from being called while TX queues no longer exist. Signed-off-by: Sathya Perla <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/emulex/benet/be_main.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 792d8383e8d6..a444110b060f 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2559,6 +2559,7 @@ static int be_close(struct net_device *netdev)
2559 * all tx skbs are freed. 2559 * all tx skbs are freed.
2560 */ 2560 */
2561 be_tx_compl_clean(adapter); 2561 be_tx_compl_clean(adapter);
2562 netif_tx_disable(netdev);
2562 2563
2563 be_rx_qs_destroy(adapter); 2564 be_rx_qs_destroy(adapter);
2564 2565
@@ -2667,6 +2668,7 @@ static int be_open(struct net_device *netdev)
2667 if (!status) 2668 if (!status)
2668 be_link_status_update(adapter, link_status); 2669 be_link_status_update(adapter, link_status);
2669 2670
2671 netif_tx_start_all_queues(netdev);
2670 be_roce_dev_open(adapter); 2672 be_roce_dev_open(adapter);
2671 return 0; 2673 return 0;
2672err: 2674err: