]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
cnic, bnx2: Check iSCSI support early in bnx2_init_one()
authorMichael Chan <mchan@broadcom.com>
Wed, 8 Jun 2011 19:29:36 +0000 (19:29 +0000)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 3 Oct 2011 18:41:05 +0000 (11:41 -0700)
commite888ec89ef2ac191e71c79382ba26e0290f7d2ca
tree8575c9cf9f08a74a8a35613992572f30790ad6f6
parent53a3c0032ef51439ea2ff9f583706ce8a7055c96
cnic, bnx2: Check iSCSI support early in bnx2_init_one()

commit 7625eb2f2fff7bfae41d3119b472c20b48874895 upstream.

Based on earlier patch from Neil Horman <nhorman@tuxdriver.com>

If iSCSI is not supported on a bnx2 device, bnx2_cnic_probe() will
return NULL and the cnic device will not be visible to bnx2i.  This
will prevent bnx2i from registering and then unregistering during
cnic_start() and cause the warning message:

bnx2 0003:01:00.1: eth1: Failed waiting for ULP up call to complete

Signed-off-by: Michael Chan <mchan@broadcom.com>
Cc: Neil Horman <nhorman@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/net/bnx2.c
drivers/net/cnic.c