Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 400484fa authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

e1000e: do not schedule the Tx queue until ready 



Start the Tx queue when the interface is brought up in e1000e_up() but do
not schedule the queue until link is up as detected in the watchdog task
which sets netif_carrier_on.

Also flush the descriptors and clean the Tx and Rx rings before resetting
the hardware when bringing the interface down otherwise there is a small
window where the watchdog task can be triggered with netif_carrier_off
and the Tx ring not yet empty which causes an additional and unnecessary
reset.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c5caf482

drivers/net/e1000e/netdev.c

+5 −6
Original line number Diff line number Diff line
@@ -3347,7 +3347,7 @@ int e1000e_up(struct e1000_adapter *adapter) 
		e1000_configure_msix(adapter);

	e1000_irq_enable(adapter);



	netif_wake_queue(adapter->netdev);

	netif_start_queue(adapter->netdev);



	/* fire a link change interrupt to start the watchdog */

	if (adapter->msix_entries)
@@ -3414,17 +3414,16 @@ void e1000e_down(struct e1000_adapter *adapter) 
	e1000e_update_stats(adapter);

	spin_unlock(&adapter->stats64_lock);



	e1000e_flush_descriptors(adapter);

	e1000_clean_tx_ring(adapter);

	e1000_clean_rx_ring(adapter);



	adapter->link_speed = 0;

	adapter->link_duplex = 0;



	if (!pci_channel_offline(adapter->pdev))

		e1000e_reset(adapter);



	e1000e_flush_descriptors(adapter);



	e1000_clean_tx_ring(adapter);

	e1000_clean_rx_ring(adapter);



	/*

	 * TODO: for power management, we could drop the link and

	 * pci_disable_device here.