From 1330dba8739f0960008e8708e46a2fe6d861286e Mon Sep 17 00:00:00 2001 From: Amit Kumar Salecha Date: Wed, 22 Jun 2011 02:52:21 +0000 Subject: [PATCH] --- yaml --- r: 255684 b: refs/heads/master c: c55ad8e56b983f03589b38b4504b5d1f41161ff8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/qlcnic/qlcnic_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 26a4c26ba66f..ad221c39c343 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f6ec29abe434676f940357bcd66536bbc69e9f8 +refs/heads/master: c55ad8e56b983f03589b38b4504b5d1f41161ff8 diff --git a/trunk/drivers/net/qlcnic/qlcnic_main.c b/trunk/drivers/net/qlcnic/qlcnic_main.c index a050746a5129..5dcb853224c9 100644 --- a/trunk/drivers/net/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/qlcnic/qlcnic_main.c @@ -1485,8 +1485,6 @@ qlcnic_setup_netdev(struct qlcnic_adapter *adapter, netdev->irq = adapter->msix_entries[0].vector; - netif_carrier_off(netdev); - err = register_netdev(netdev); if (err) { dev_err(&pdev->dev, "failed to register net device\n"); @@ -1816,6 +1814,8 @@ static int qlcnic_open(struct net_device *netdev) struct qlcnic_adapter *adapter = netdev_priv(netdev); int err; + netif_carrier_off(netdev); + err = qlcnic_attach(adapter); if (err) return err;