[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1299610768.4957.1.camel@bwh-desktop>
Date: Tue, 08 Mar 2011 18:59:28 +0000
From: Ben Hutchings <bhutchings@...arflare.com>
To: Neil Horman <nhorman@...driver.com>
Cc: netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
Michael Chan <mchan@...adcom.com>,
Dmitry Kravkov <dmitry@...adcom.com>,
Eddie Wai <waie@...adcom.com>,
Eilon Greenstein <eilong@...adcom.com>
Subject: Re: [PATCH] cnic: fix double initalization of bnx2 based cards
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?
And why is a function named 'is_cnic_dev' doing initialisation, anyway?
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 <nhorman@...driver.com>
> CC: David S. Miller <davem@...emloft.net>
> CC: Michael Chan <mchan@...adcom.com>
> CC: Dmitry Kravkov <dmitry@...adcom.com>
> CC: Eddie Wai <waie@...adcom.com>
> CC: Eilon Greenstein <eilong@...adcom.com>
> ---
> 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);
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists