diff options
| author | Michael Chan <mchan@broadcom.com> | 2011-06-08 19:29:36 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:41:05 -0700 |
| commit | e888ec89ef2ac191e71c79382ba26e0290f7d2ca (patch) | |
| tree | 8575c9cf9f08a74a8a35613992572f30790ad6f6 /drivers/net/bnx2.c | |
| parent | 53a3c0032ef51439ea2ff9f583706ce8a7055c96 (diff) | |
| download | kernel_samsung_smdk4412-e888ec89ef2ac191e71c79382ba26e0290f7d2ca.zip kernel_samsung_smdk4412-e888ec89ef2ac191e71c79382ba26e0290f7d2ca.tar.gz kernel_samsung_smdk4412-e888ec89ef2ac191e71c79382ba26e0290f7d2ca.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/bnx2.c')
| -rw-r--r-- | drivers/net/bnx2.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c index 57d3293..74580bb 100644 --- a/drivers/net/bnx2.c +++ b/drivers/net/bnx2.c @@ -416,6 +416,9 @@ struct cnic_eth_dev *bnx2_cnic_probe(struct net_device *dev) struct bnx2 *bp = netdev_priv(dev); struct cnic_eth_dev *cp = &bp->cnic_eth_dev; + if (!cp->max_iscsi_conn) + return NULL; + cp->drv_owner = THIS_MODULE; cp->chip_id = bp->chip_id; cp->pdev = bp->pdev; @@ -8177,6 +8180,10 @@ bnx2_init_board(struct pci_dev *pdev, struct net_device *dev) bp->timer.data = (unsigned long) bp; bp->timer.function = bnx2_timer; +#ifdef BCM_CNIC + bp->cnic_eth_dev.max_iscsi_conn = + bnx2_reg_rd_ind(bp, BNX2_FW_MAX_ISCSI_CONN); +#endif pci_save_state(pdev); return 0; |