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)
committerDavid S. Miller <davem@davemloft.net>
Thu, 9 Jun 2011 06:52:37 +0000 (23:52 -0700)
commit7625eb2f2fff7bfae41d3119b472c20b48874895
tree4d1cd5f9cfb5b563faa3e5afe5a3f3e2e641e6cb
parentdb1d350fcb156b58f66a67680617077bcacfe6fc
cnic, bnx2: Check iSCSI support early in bnx2_init_one()

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>
drivers/net/bnx2.c
drivers/net/cnic.c