diff options
-rw-r--r-- | drivers/net/cnic.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/net/cnic.c b/drivers/net/cnic.c index ea75f65a179c..455fd0dacb38 100644 --- a/drivers/net/cnic.c +++ b/drivers/net/cnic.c | |||
@@ -1172,7 +1172,7 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev) | |||
1172 | 1172 | ||
1173 | cp->iro_arr = ethdev->iro_arr; | 1173 | cp->iro_arr = ethdev->iro_arr; |
1174 | 1174 | ||
1175 | cp->max_cid_space = MAX_ISCSI_TBL_SZ + BNX2X_FCOE_NUM_CONNECTIONS; | 1175 | cp->max_cid_space = MAX_ISCSI_TBL_SZ; |
1176 | cp->iscsi_start_cid = start_cid; | 1176 | cp->iscsi_start_cid = start_cid; |
1177 | cp->fcoe_start_cid = start_cid + MAX_ISCSI_TBL_SZ; | 1177 | cp->fcoe_start_cid = start_cid + MAX_ISCSI_TBL_SZ; |
1178 | 1178 | ||
@@ -1183,14 +1183,6 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev) | |||
1183 | cp->fcoe_init_cid = 0x10; | 1183 | cp->fcoe_init_cid = 0x10; |
1184 | } | 1184 | } |
1185 | 1185 | ||
1186 | if (start_cid < BNX2X_ISCSI_START_CID) { | ||
1187 | u32 delta = BNX2X_ISCSI_START_CID - start_cid; | ||
1188 | |||
1189 | cp->iscsi_start_cid = BNX2X_ISCSI_START_CID; | ||
1190 | cp->fcoe_start_cid += delta; | ||
1191 | cp->max_cid_space += delta; | ||
1192 | } | ||
1193 | |||
1194 | cp->iscsi_tbl = kzalloc(sizeof(struct cnic_iscsi) * MAX_ISCSI_TBL_SZ, | 1186 | cp->iscsi_tbl = kzalloc(sizeof(struct cnic_iscsi) * MAX_ISCSI_TBL_SZ, |
1195 | GFP_KERNEL); | 1187 | GFP_KERNEL); |
1196 | if (!cp->iscsi_tbl) | 1188 | if (!cp->iscsi_tbl) |