提交 82346a7b 编写于 作者: M Michael Chan 提交者: David S. Miller

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

Update version to 2.5.13.
Reviewed-by: NEddie Wai <eddie.wai@broadcom.com>
Reviewed-by: NBhanu Prakash Gollapudi <bprakash@broadcom.com>
Signed-off-by: NMichael Chan <mchan@broadcom.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 51a8f54d
......@@ -1303,6 +1303,9 @@ static int cnic_alloc_bnx2x_resc(struct cnic_dev *dev)
if (ret)
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->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
* 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);
i++;
}
......
......@@ -14,8 +14,8 @@
#include "bnx2x/bnx2x_mfw_req.h"
#define CNIC_MODULE_VERSION "2.5.12"
#define CNIC_MODULE_RELDATE "June 29, 2012"
#define CNIC_MODULE_VERSION "2.5.13"
#define CNIC_MODULE_RELDATE "Sep 07, 2012"
#define CNIC_ULP_RDMA 0
#define CNIC_ULP_ISCSI 1
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册