cnic: Add the interfaces to get FC-NPIV table.

Orabug: 22013781

Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>

diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index 17c145fdf3ff6f40e2ef25098e1c0b423dcf9c5f..ee921f8738564b6e889f05b28f799dc8f13598bc 100644 (file)
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -5433,6 +5433,23 @@ static void cnic_free_dev(struct cnic_dev *dev)
        kfree(dev);
 }
 
+static int cnic_get_fc_npiv_tbl(struct cnic_dev *dev,
+                               struct cnic_fc_npiv_tbl *npiv_tbl)
+{
+       struct cnic_local *cp = dev->cnic_priv;
+       struct bnx2x *bp = netdev_priv(dev->netdev);
+       int ret;
+                                       
+       if (!test_bit(CNIC_F_CNIC_UP, &dev->flags))
+               return -EAGAIN;     /* bnx2x is down */
+
+       if (!BNX2X_CHIP_IS_E2_PLUS(bp))
+               return -EINVAL;
+
+       ret = cp->ethdev->drv_get_fc_npiv_tbl(dev->netdev, npiv_tbl);
+       return ret;
+}
+
 static struct cnic_dev *cnic_alloc_dev(struct net_device *dev,
                                       struct pci_dev *pdev)
 {
@@ -5451,6 +5468,7 @@ static struct cnic_dev *cnic_alloc_dev(struct net_device *dev,
        cdev->register_device = cnic_register_device;
        cdev->unregister_device = cnic_unregister_device;
        cdev->iscsi_nl_msg_recv = cnic_iscsi_nl_msg_recv;
+       cdev->get_fc_npiv_tbl = cnic_get_fc_npiv_tbl;
 
        cp = cdev->cnic_priv;
        cp->dev = cdev;

diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index ef6125b0ee3ed35fbd96dc0a2c5647fa0894e3b0..d25b1fab20f04609d8f40812a64754e4bcb6a914 100644 (file)
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
@@ -15,8 +15,8 @@
 
 #include "bnx2x/bnx2x_mfw_req.h"
 
-#define CNIC_MODULE_VERSION    "2.5.21"
-#define CNIC_MODULE_RELDATE    "January 29, 2015"
+#define CNIC_MODULE_VERSION    "2.5.22"
+#define CNIC_MODULE_RELDATE    "July 20, 2015"
 
 #define CNIC_ULP_RDMA          0
 #define CNIC_ULP_ISCSI         1
@@ -161,6 +161,15 @@ struct drv_ctl_info {
        } data;
 };
 
+#define MAX_NPIV_ENTRIES 64
+#define FC_NPIV_WWN_SIZE 8
+
+struct cnic_fc_npiv_tbl {
+       u8 wwpn[MAX_NPIV_ENTRIES][FC_NPIV_WWN_SIZE];
+       u8 wwnn[MAX_NPIV_ENTRIES][FC_NPIV_WWN_SIZE];
+       u32 count;
+};
+
 struct cnic_ops {
        struct module   *cnic_owner;
        /* Calls to these functions are protected by RCU.  When
@@ -226,6 +235,8 @@ struct cnic_eth_dev {
        int             (*drv_submit_kwqes_16)(struct net_device *,
                                               struct kwqe_16 *[], u32);
        int             (*drv_ctl)(struct net_device *, struct drv_ctl_info *);
+       int             (*drv_get_fc_npiv_tbl)(struct net_device *,
+                                       struct cnic_fc_npiv_tbl *);
        unsigned long   reserved1[2];
        union drv_info_to_mcp   *addr_drv_info_to_mcp;
 };
@@ -314,6 +325,7 @@ struct cnic_dev {
        struct cnic_dev *(*cm_select_dev)(struct sockaddr_in *, int ulp_type);
        int (*iscsi_nl_msg_recv)(struct cnic_dev *dev, u32 msg_type,
                                 char *data, u16 data_size);
+       int (*get_fc_npiv_tbl)(struct cnic_dev *, struct cnic_fc_npiv_tbl *);
        unsigned long   flags;
 #define CNIC_F_CNIC_UP         1
 #define CNIC_F_BNX2_CLASS      3