From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Michael Chan" Subject: Re: [PATCH] cnic: fix double initalization of bnx2 based cards Date: Tue, 8 Mar 2011 11:07:57 -0800 Message-ID: <1299611277.12601.15.camel@HP1> References: <1299610588-22356-1-git-send-email-nhorman@tuxdriver.com> <1299610768.4957.1.camel@bwh-desktop> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: 7bit Cc: "Neil Horman" , "netdev@vger.kernel.org" , "David S. Miller" , "Dmitry Kravkov" , "Eddie Wai" , "Eilon Greenstein" To: "Ben Hutchings" Return-path: Received: from mms3.broadcom.com ([216.31.210.19]:3918 "EHLO MMS3.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754619Ab1CHTNE (ORCPT ); Tue, 8 Mar 2011 14:13:04 -0500 In-Reply-To: <1299610768.4957.1.camel@bwh-desktop> Sender: netdev-owner@vger.kernel.org List-ID: On Tue, 2011-03-08 at 10:59 -0800, Ben Hutchings wrote: > On Tue, 2011-03-08 at 13:56 -0500, Neil Horman wrote: > > 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). > > Since when does strcmp() do a regex match? Yeah, strcmp() does NULL-terminated string compare, right? > > And why is a function named 'is_cnic_dev' doing initialisation, anyway? Just data structure init if a supported device is detected. > > Ben. > > > 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); >