summaryrefslogtreecommitdiffstats
path: root/drivers/net/ethernet/broadcom/cnic_if.h
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2012-06-29 09:32:45 +0000
committerDavid S. Miller <davem@davemloft.net>2012-06-29 15:33:28 -0700
commitae0eef66088777cf252c6b91d3eb5ef2f30a67c5 (patch)
tree4743bd257ceefb4e53931392baaedc8de8cb8a8e /drivers/net/ethernet/broadcom/cnic_if.h
parent7a9bc9b81a5bc6e44ebc80ef781332e4385083f2 (diff)
cnic: Fix mmap regression.
commit 1f85d58cdf15354a7120fc9ccc9bb9c45b53af88 cnic: Remove uio mem[0]. introduced a regression as older versions of userspace app still rely on this mmap. Restore the mmap functionality and get the base address from pci_resource_start() as the nedev->base_addr has been deprecated for PCI devices. Update version to 2.5.12. Signed-off-by: Michael Chan <mchan@broadocm.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic_if.h')
-rw-r--r--drivers/net/ethernet/broadcom/cnic_if.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index 54f68f07692..5cb88881bba 100644
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
@@ -14,8 +14,8 @@
#include "bnx2x/bnx2x_mfw_req.h"
-#define CNIC_MODULE_VERSION "2.5.11"
-#define CNIC_MODULE_RELDATE "June 27, 2012"
+#define CNIC_MODULE_VERSION "2.5.12"
+#define CNIC_MODULE_RELDATE "June 29, 2012"
#define CNIC_ULP_RDMA 0
#define CNIC_ULP_ISCSI 1