bnx2x, cnic: Consolidate iSCSI/FCoE shared mem logic in bnx2x

Move all shared mem code to bnx2x to avoid code duplication.  bnx2x now
performs:

- Read the FCoE and iSCSI max connection information.
- Read the iSCSI and FCoE MACs from NPAR configuration in shmem.
- Block the CNIC for the current function if there is neither FCoE nor
  iSCSI valid configuration by returning NULL from bnx2x_cnic_probe().

Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 6 insertions, 2 deletions

diff --git a/drivers/net/cnic_if.h b/drivers/net/cnic_if.h
index 9f44e0ffe003..e01b49ee3591 100644
--- a/drivers/net/cnic_if.h
+++ b/drivers/net/cnic_if.h
@@ -12,8 +12,8 @@
 #ifndef CNIC_IF_H
 #define CNIC_IF_H
 
-#define CNIC_MODULE_VERSION     "2.2.12"
-#define CNIC_MODULE_RELDATE     "Jan 03, 2011"
+#define CNIC_MODULE_VERSION     "2.2.13"
+#define CNIC_MODULE_RELDATE     "Jan 31, 2011"
 
 #define CNIC_ULP_RDMA           0
 #define CNIC_ULP_ISCSI          1
@@ -159,6 +159,9 @@ struct cnic_eth_dev {
         u32             drv_state;
 #define CNIC_DRV_STATE_REGD             0x00000001
 #define CNIC_DRV_STATE_USING_MSIX       0x00000002
+#define CNIC_DRV_STATE_NO_ISCSI_OOO     0x00000004
+#define CNIC_DRV_STATE_NO_ISCSI         0x00000008
+#define CNIC_DRV_STATE_NO_FCOE          0x00000010
         u32             chip_id;
         u32             max_kwqe_pending;
         struct pci_dev  *pdev;
@@ -176,6 +179,7 @@ struct cnic_eth_dev {
         u32             fcoe_init_cid;
         u16             iscsi_l2_client_id;
         u16             iscsi_l2_cid;
+        u8              iscsi_mac[ETH_ALEN];
 
         int             num_irq;
         struct cnic_irq irq_arr[MAX_CNIC_VEC];