aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/qlcnic
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit.salecha@qlogic.com>2011-06-21 22:52:21 -0400
committerDavid S. Miller <davem@davemloft.net>2011-06-24 04:17:07 -0400
commitc55ad8e56b983f03589b38b4504b5d1f41161ff8 (patch)
tree3c89665e2aa76803010d37dfae47bf55ef419618 /drivers/net/qlcnic
parent5f6ec29abe434676f940357bcd66536bbc69e9f8 (diff)
qlcnic: fix default operating state of interface
Currently interface shows status as RUNNING, even if there is no link. To fix this, netif_carrier_off should be called qlcnic_open(). Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com> Signed-off-by: Anirban Chakraborty <anirban.chakraborty@qlogic.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic')
-rw-r--r--drivers/net/qlcnic/qlcnic_main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c
index a050746a512..5dcb853224c 100644
--- a/drivers/net/qlcnic/qlcnic_main.c
+++ b/drivers/net/qlcnic/qlcnic_main.c
@@ -1485,8 +1485,6 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter,
1485 1485
1486 netdev->irq = adapter->msix_entries[0].vector; 1486 netdev->irq = adapter->msix_entries[0].vector;
1487 1487
1488 netif_carrier_off(netdev);
1489
1490 err = register_netdev(netdev); 1488 err = register_netdev(netdev);
1491 if (err) { 1489 if (err) {
1492 dev_err(&pdev->dev, "failed to register net device\n"); 1490 dev_err(&pdev->dev, "failed to register net device\n");
@@ -1816,6 +1814,8 @@ static int qlcnic_open(struct net_device *netdev)
1816 struct qlcnic_adapter *adapter = netdev_priv(netdev); 1814 struct qlcnic_adapter *adapter = netdev_priv(netdev);
1817 int err; 1815 int err;
1818 1816
1817 netif_carrier_off(netdev);
1818
1819 err = qlcnic_attach(adapter); 1819 err = qlcnic_attach(adapter);
1820 if (err) 1820 if (err)
1821 return err; 1821 return err;