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

Commit 6cdd20c3 authored by Neil Horman's avatar Neil Horman Committed by David S. Miller
Browse files

vmxnet3: set carrier state properly on probe 



vmxnet3 fails to set netif_carrier_off on probe, meaning that when an interface
is opened the __LINK_STATE_NOCARRIER bit is already cleared, and so
/sys/class/net/<ifname>/operstate remains in the unknown state.  Correct this by
setting netif_carrier_off on probe, like other drivers do.

Also, while we're at it, lets remove the netif_carrier_ok checks from the
link_state_update function, as that check is atomically contained within the
netif_carrier_[on|off] functions anyway

Tested successfully by myself

Signed-off-by: default avatarNeil Horman <nhorman@tuxdriver.com>
CC: "David S. Miller" <davem@davemloft.net>
CC: "VMware, Inc." <pv-drivers@vmware.com>
CC: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 28600304

drivers/net/vmxnet3/vmxnet3_drv.c

+3 −4
Original line number Diff line number Diff line
@@ -154,7 +154,6 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue) 
	if (ret & 1) { /* Link is up. */

		printk(KERN_INFO "%s: NIC Link is Up %d Mbps\n",

		       adapter->netdev->name, adapter->link_speed);

		if (!netif_carrier_ok(adapter->netdev))

		netif_carrier_on(adapter->netdev);



		if (affectTxQueue) {
@@ -165,7 +164,6 @@ vmxnet3_check_link(struct vmxnet3_adapter *adapter, bool affectTxQueue) 
	} else {

		printk(KERN_INFO "%s: NIC Link is Down\n",

		       adapter->netdev->name);

		if (netif_carrier_ok(adapter->netdev))

		netif_carrier_off(adapter->netdev);



		if (affectTxQueue) {
@@ -3061,6 +3059,7 @@ vmxnet3_probe_device(struct pci_dev *pdev, 
	netif_set_real_num_tx_queues(adapter->netdev, adapter->num_tx_queues);

	netif_set_real_num_rx_queues(adapter->netdev, adapter->num_rx_queues);



	netif_carrier_off(netdev);

	err = register_netdev(netdev);



	if (err) {