From mboxrd@z Thu Jan 1 00:00:00 1970 From: Neil Horman Subject: [PATCH] cnic: fix double initalization of bnx2 based cards Date: Tue, 8 Mar 2011 13:56:28 -0500 Message-ID: <1299610588-22356-1-git-send-email-nhorman@tuxdriver.com> Cc: Neil Horman , "David S. Miller" , Michael Chan , Dmitry Kravkov , Eddie Wai , Eilon Greenstein To: netdev@vger.kernel.org Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:35516 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752250Ab1CHS5F (ORCPT ); Tue, 8 Mar 2011 13:57:05 -0500 Sender: netdev-owner@vger.kernel.org List-ID: bnx2 cards can work with the cnic driver, but when the cnic driver detects a bnx2 card, is_cnic_dev erroneously calls the initalization routines for both bnx2 and bnx2x (the former being a regex subset of the later). This causes initalization of bnx2 to unilaterally fail in the cnic driver, which, while not catastrophic, is definately not expected. Fix this by choosing either the bnx2 or bnx2x initalization path, not both Signed-off-by: Neil Horman CC: David S. Miller CC: Michael Chan CC: Dmitry Kravkov CC: Eddie Wai CC: Eilon Greenstein --- drivers/net/cnic.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 271a1f0..18b59ad 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c @@ -5292,7 +5292,7 @@ static struct cnic_dev *is_cnic_dev(struct net_device *dev) if (!strcmp(drvinfo.driver, "bnx2")) cdev = init_bnx2_cnic(dev); - if (!strcmp(drvinfo.driver, "bnx2x")) + else if (!strcmp(drvinfo.driver, "bnx2x")) cdev = init_bnx2x_cnic(dev); if (cdev) { write_lock(&cnic_dev_lock); -- 1.7.4