From patchwork Thu Jun 16 20:37:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anirban Chakraborty X-Patchwork-Id: 100720 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id BA8CCB6F80 for ; Fri, 17 Jun 2011 06:45:36 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932506Ab1FPUpb (ORCPT ); Thu, 16 Jun 2011 16:45:31 -0400 Received: from vpn.pathscale.com ([198.186.3.75]:50523 "HELO mx.mv.qlogic.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with SMTP id S1758694Ab1FPUp3 (ORCPT ); Thu, 16 Jun 2011 16:45:29 -0400 Received: from lnxdev-sm-001.mv.qlogic.com (dut6217.mv.qlogic.com [172.29.56.217]) by mx.mv.qlogic.com (Postfix) with ESMTP id 8BB7539849; Thu, 16 Jun 2011 13:45:18 -0700 (PDT) Received: by lnxdev-sm-001.mv.qlogic.com (Postfix, from userid 0) id B4C7714AE91; Thu, 16 Jun 2011 13:37:39 -0700 (PDT) From: Anirban Chakraborty To: netdev@vger.kernel.org Cc: David Miller , Amit Kumar Salecha Subject: [PATCH net-next 5/7] qlcnic: fix default operating state of interface Date: Thu, 16 Jun 2011 13:37:36 -0700 Message-Id: <1308256659-19895-5-git-send-email-anirban.chakraborty@qlogic.com> X-Mailer: git-send-email 1.6.0.2 In-Reply-To: <1308256659-19895-1-git-send-email-anirban.chakraborty@qlogic.com> References: <1308256659-19895-1-git-send-email-anirban.chakraborty@qlogic.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Amit Kumar Salecha Currently interface shows status as RUNNING, even if there is no link. To fix this, netif_carrier_off should be called after register_netdev(). netif_carrier_off calls linkwatch_fire_event(dev); only if netdev is registered, otherwise it skips. linkwatch_fire_event set default state of nic interface. Signed-off-by: Amit Kumar Salecha Signed-off-by: Anirban Chakraborty --- drivers/net/qlcnic/qlcnic_main.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 8c07c4e..5348dba 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -1485,14 +1485,14 @@ 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"); return err; } + netif_carrier_off(netdev); + return 0; }