From 8049bad31a86caf6ce5b9f09c07cdaa166df8004 Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Sat, 8 Sep 2012 06:01:05 +0000 Subject: [PATCH] --- yaml --- r: 327841 b: refs/heads/master c: 82346a7b6a14793a48cc7a0692a007daf0843f99 h: refs/heads/master i: 327839: dc2fa7a519dd18a6d1d5044c43f3ef8c52b67f81 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/cnic.c | 5 ++++- trunk/drivers/net/ethernet/broadcom/cnic_if.h | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e1e404c7018e..24eef48bcc06 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51a8f54d13f1b2e91da214ff1e619628bd68fd27 +refs/heads/master: 82346a7b6a14793a48cc7a0692a007daf0843f99 diff --git a/trunk/drivers/net/ethernet/broadcom/cnic.c b/trunk/drivers/net/ethernet/broadcom/cnic.c index c2233143402a..2107d79d69b3 100644 --- a/trunk/drivers/net/ethernet/broadcom/cnic.c +++ b/trunk/drivers/net/ethernet/broadcom/cnic.c @@ -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++; } diff --git a/trunk/drivers/net/ethernet/broadcom/cnic_if.h b/trunk/drivers/net/ethernet/broadcom/cnic_if.h index 5cb88881bba1..2e92c348083e 100644 --- a/trunk/drivers/net/ethernet/broadcom/cnic_if.h +++ b/trunk/drivers/net/ethernet/broadcom/cnic_if.h @@ -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