From d09f698056a33c8b078497fb23e3304b6f8a908f Mon Sep 17 00:00:00 2001 From: Sathya Perla Date: Tue, 2 Aug 2011 19:57:41 +0000 Subject: be2net: remove wrong and unnecessary calls to netif_carrier_off() 1) In be_probe(), as soon as the MCC Q is created a gratuitous link status event is received and processed. Accordingly netif_carrier_off/on() is called. The extra netif_carrier_off() call in probe can race with this and cause wrong state. 2) be_close() need not call netif_carrier_off(). It is OK to show the actual link state even when the device is administratively down. Signed-off-by: Sathya Perla Signed-off-by: David S. Miller --- drivers/net/benet/be_main.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/net') diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c index 9f2f66c66be6..553cc0dc6c91 100644 --- a/drivers/net/benet/be_main.c +++ b/drivers/net/benet/be_main.c @@ -2217,7 +2217,6 @@ static int be_close(struct net_device *netdev) be_async_mcc_disable(adapter); - netif_carrier_off(netdev); adapter->link_up = false; if (!lancer_chip(adapter)) @@ -3345,7 +3344,6 @@ static int __devinit be_probe(struct pci_dev *pdev, status = register_netdev(netdev); if (status != 0) goto unsetup; - netif_carrier_off(netdev); if (be_physfn(adapter) && adapter->sriov_enabled) { u8 mac_speed; -- cgit v1.2.3