netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] cnic: fix double initalization of bnx2 based cards
@ 2011-03-08 18:56 Neil Horman
  2011-03-08 18:59 ` Ben Hutchings
  0 siblings, 1 reply; 8+ messages in thread
From: Neil Horman @ 2011-03-08 18:56 UTC (permalink / raw)
  To: netdev
  Cc: Neil Horman, David S. Miller, Michael Chan, Dmitry Kravkov,
	Eddie Wai, Eilon Greenstein

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 <nhorman@tuxdriver.com>
CC: David S. Miller <davem@davemloft.net>
CC: Michael Chan <mchan@broadcom.com>
CC: Dmitry Kravkov <dmitry@broadcom.com>
CC: Eddie Wai <waie@broadcom.com>
CC: Eilon Greenstein <eilong@broadcom.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);
-- 
1.7.4


^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2011-03-08 21:46 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-08 18:56 [PATCH] cnic: fix double initalization of bnx2 based cards Neil Horman
2011-03-08 18:59 ` Ben Hutchings
2011-03-08 19:07   ` Michael Chan
2011-03-08 19:36     ` Neil Horman
2011-03-08 19:40       ` Ben Hutchings
2011-03-08 19:43       ` Michael Chan
2011-03-08 21:40         ` Neil Horman
2011-03-08 21:41           ` Michael Chan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).