diff options
Diffstat (limited to 'drivers/net/cnic.c')
-rw-r--r-- | drivers/net/cnic.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index 6c544b3411fa..363c7f368909 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c | |||
@@ -4225,14 +4225,6 @@ static void cnic_enable_bnx2_int(struct cnic_dev *dev) | |||
4225 | BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx); | 4225 | BNX2_PCICFG_INT_ACK_CMD_INDEX_VALID | cp->last_status_idx); |
4226 | } | 4226 | } |
4227 | 4227 | ||
4228 | static void cnic_get_bnx2_iscsi_info(struct cnic_dev *dev) | ||
4229 | { | ||
4230 | u32 max_conn; | ||
4231 | |||
4232 | max_conn = cnic_reg_rd_ind(dev, BNX2_FW_MAX_ISCSI_CONN); | ||
4233 | dev->max_iscsi_conn = max_conn; | ||
4234 | } | ||
4235 | |||
4236 | static void cnic_disable_bnx2_int_sync(struct cnic_dev *dev) | 4228 | static void cnic_disable_bnx2_int_sync(struct cnic_dev *dev) |
4237 | { | 4229 | { |
4238 | struct cnic_local *cp = dev->cnic_priv; | 4230 | struct cnic_local *cp = dev->cnic_priv; |
@@ -4557,8 +4549,6 @@ static int cnic_start_bnx2_hw(struct cnic_dev *dev) | |||
4557 | return err; | 4549 | return err; |
4558 | } | 4550 | } |
4559 | 4551 | ||
4560 | cnic_get_bnx2_iscsi_info(dev); | ||
4561 | |||
4562 | return 0; | 4552 | return 0; |
4563 | } | 4553 | } |
4564 | 4554 | ||
@@ -5224,6 +5214,8 @@ static struct cnic_dev *init_bnx2_cnic(struct net_device *dev) | |||
5224 | cdev->pcidev = pdev; | 5214 | cdev->pcidev = pdev; |
5225 | cp->chip_id = ethdev->chip_id; | 5215 | cp->chip_id = ethdev->chip_id; |
5226 | 5216 | ||
5217 | cdev->max_iscsi_conn = ethdev->max_iscsi_conn; | ||
5218 | |||
5227 | cp->cnic_ops = &cnic_bnx2_ops; | 5219 | cp->cnic_ops = &cnic_bnx2_ops; |
5228 | cp->start_hw = cnic_start_bnx2_hw; | 5220 | cp->start_hw = cnic_start_bnx2_hw; |
5229 | cp->stop_hw = cnic_stop_bnx2_hw; | 5221 | cp->stop_hw = cnic_stop_bnx2_hw; |