summaryrefslogtreecommitdiffstats
path: root/drivers/net/benet
diff options
context:
space:
mode:
authorSathya Perla <sathya.perla@emulex.com>2011-08-02 19:57:41 +0000
committerDavid S. Miller <davem@davemloft.net>2011-08-03 03:23:29 -0700
commitd09f698056a33c8b078497fb23e3304b6f8a908f (patch)
tree9d1be0be2f7ae5d60689e005b567efe74dd4b4ae /drivers/net/benet
parenta9b3cd7f323b2e57593e7215362a7b02fc933e3a (diff)
downloadop-kernel-dev-d09f698056a33c8b078497fb23e3304b6f8a908f.zip
op-kernel-dev-d09f698056a33c8b078497fb23e3304b6f8a908f.tar.gz
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 <sathya.perla@emulex.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/benet')
-rw-r--r--drivers/net/benet/be_main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/benet/be_main.c b/drivers/net/benet/be_main.c
index 9f2f66c..553cc0d 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;
OpenPOWER on IntegriCloud