UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

cnic: Allocate UIO resources only on devices that support iSCSI. 

Update version to 2.5.13.

Reviewed-by: Eddie Wai <eddie.wai@broadcom.com>
Reviewed-by: Bhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael Chan 2012-09-08 06:01:05 +00:00 committed by David S. Miller
parent 51a8f54d13
commit 82346a7b6a
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/ethernet/broadcom/cnic.c
View File

@ -1303,6 +1303,9 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
if (ret) if (ret)
goto error; goto error;
if (cp->ethdev->drv_state & CNIC_DRV_STATE_NO_ISCSI)
return 0;
cp->bnx2x_def_status_blk = cp->ethdev->irq_arr[1].status_blk; cp->bnx2x_def_status_blk = cp->ethdev->irq_arr[1].status_blk;
cp->l2_rx_ring_size = 15; cp->l2_rx_ring_size = 15;
@ -5351,7 +5354,7 @@ static void cnic_stop_hw(struct cnic_dev *dev)
/* Need to wait for the ring shutdown event to complete /* Need to wait for the ring shutdown event to complete
* before clearing the CNIC_UP flag. * before clearing the CNIC_UP flag.
*/ */
while (cp->udev->uio_dev != -1 && i < 15) { while (cp->udev && cp->udev->uio_dev != -1 && i < 15) {
msleep(100); msleep(100);
i++; i++;
} }

4
drivers/net/ethernet/broadcom/cnic_if.h
View File

@ -14,8 +14,8 @@
#include "bnx2x/bnx2x_mfw_req.h" #include "bnx2x/bnx2x_mfw_req.h"
#define CNIC_MODULE_VERSION "2.5.12" #define CNIC_MODULE_VERSION "2.5.13"
#define CNIC_MODULE_RELDATE "June 29, 2012" #define CNIC_MODULE_RELDATE "Sep 07, 2012"
#define CNIC_ULP_RDMA 0 #define CNIC_ULP_RDMA 0
#define CNIC_ULP_ISCSI 1 #define CNIC_ULP_ISCSI 1