diff options
-rw-r--r-- | drivers/net/ethernet/broadcom/cnic.c | 1 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/cnic.h | 2 | ||||
-rw-r--r-- | drivers/net/ethernet/broadcom/cnic_if.h | 4 |
3 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c index f58a8b80302d..fcf9105a5476 100644 --- a/drivers/net/ethernet/broadcom/cnic.c +++ b/drivers/net/ethernet/broadcom/cnic.c | |||
@@ -5220,6 +5220,7 @@ static void cnic_init_rings(struct cnic_dev *dev) | |||
5220 | cnic_ring_ctl(dev, cid, cli, 1); | 5220 | cnic_ring_ctl(dev, cid, cli, 1); |
5221 | *cid_ptr = cid >> 4; | 5221 | *cid_ptr = cid >> 4; |
5222 | *(cid_ptr + 1) = cid * bp->db_size; | 5222 | *(cid_ptr + 1) = cid * bp->db_size; |
5223 | *(cid_ptr + 2) = UIO_USE_TX_DOORBELL; | ||
5223 | } | 5224 | } |
5224 | } | 5225 | } |
5225 | 5226 | ||
diff --git a/drivers/net/ethernet/broadcom/cnic.h b/drivers/net/ethernet/broadcom/cnic.h index 0121a5d55192..0d6b13f854d9 100644 --- a/drivers/net/ethernet/broadcom/cnic.h +++ b/drivers/net/ethernet/broadcom/cnic.h | |||
@@ -186,6 +186,8 @@ struct kcq_info { | |||
186 | u16 (*hw_idx)(u16); | 186 | u16 (*hw_idx)(u16); |
187 | }; | 187 | }; |
188 | 188 | ||
189 | #define UIO_USE_TX_DOORBELL 0x017855DB | ||
190 | |||
189 | struct cnic_uio_dev { | 191 | struct cnic_uio_dev { |
190 | struct uio_info cnic_uinfo; | 192 | struct uio_info cnic_uinfo; |
191 | u32 uio_dev; | 193 | u32 uio_dev; |
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h index ebbfe25acaa6..8cf6b1926069 100644 --- a/drivers/net/ethernet/broadcom/cnic_if.h +++ b/drivers/net/ethernet/broadcom/cnic_if.h | |||
@@ -14,8 +14,8 @@ | |||
14 | 14 | ||
15 | #include "bnx2x/bnx2x_mfw_req.h" | 15 | #include "bnx2x/bnx2x_mfw_req.h" |
16 | 16 | ||
17 | #define CNIC_MODULE_VERSION "2.5.18" | 17 | #define CNIC_MODULE_VERSION "2.5.19" |
18 | #define CNIC_MODULE_RELDATE "Sept 01, 2013" | 18 | #define CNIC_MODULE_RELDATE "December 19, 2013" |
19 | 19 | ||
20 | #define CNIC_ULP_RDMA 0 | 20 | #define CNIC_ULP_RDMA 0 |
21 | #define CNIC_ULP_ISCSI 1 | 21 | #define CNIC_ULP_ISCSI 1 |