1 files changed, 44 insertions, 0 deletions

diff --git a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
index f52f668fd24..05fe6620b3f 100644
--- a/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
+++ b/drivers/scsi/bnx2fc/bnx2fc_fcoe.c
@@ -1326,6 +1326,7 @@ static void bnx2fc_hba_destroy(struct bnx2fc_hba *hba)
 static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
 {
         struct bnx2fc_hba *hba;
+        struct fcoe_capabilities *fcoe_cap;
         int rc;
 
         hba = kzalloc(sizeof(*hba), GFP_KERNEL);
@@ -1361,6 +1362,21 @@ static struct bnx2fc_hba *bnx2fc_hba_create(struct cnic_dev *cnic)
                 printk(KERN_ERR PFX "em_config:bnx2fc_cmd_mgr_alloc failed\n");
                 goto cmgr_err;
         }
+        fcoe_cap = &hba->fcoe_cap;
+
+        fcoe_cap->capability1 = BNX2FC_TM_MAX_SQES <<
+                                        FCOE_IOS_PER_CONNECTION_SHIFT;
+        fcoe_cap->capability1 |= BNX2FC_NUM_MAX_SESS <<
+                                        FCOE_LOGINS_PER_PORT_SHIFT;
+        fcoe_cap->capability2 = BNX2FC_MAX_OUTSTANDING_CMNDS <<
+                                        FCOE_NUMBER_OF_EXCHANGES_SHIFT;
+        fcoe_cap->capability2 |= BNX2FC_MAX_NPIV <<
+                                        FCOE_NPIV_WWN_PER_PORT_SHIFT;
+        fcoe_cap->capability3 = BNX2FC_NUM_MAX_SESS <<
+                                        FCOE_TARGETS_SUPPORTED_SHIFT;
+        fcoe_cap->capability3 |= BNX2FC_MAX_OUTSTANDING_CMNDS <<
+                                        FCOE_OUTSTANDING_COMMANDS_SHIFT;
+        fcoe_cap->capability4 = FCOE_CAPABILITY4_STATEFUL;
 
         init_waitqueue_head(&hba->shutdown_wait);
         init_waitqueue_head(&hba->destroy_wait);
@@ -1691,6 +1707,32 @@ static void bnx2fc_unbind_pcidev(struct bnx2fc_hba *hba)
         hba->pcidev = NULL;
 }
 
+/**
+ * bnx2fc_ulp_get_stats - cnic callback to populate FCoE stats
+ *
+ * @handle:    transport handle pointing to adapter struture
+ */
+static int bnx2fc_ulp_get_stats(void *handle)
+{
+        struct bnx2fc_hba *hba = handle;
+        struct cnic_dev *cnic;
+        struct fcoe_stats_info *stats_addr;
+
+        if (!hba)
+                return -EINVAL;
+
+        cnic = hba->cnic;
+        stats_addr = &cnic->stats_addr->fcoe_stat;
+        if (!stats_addr)
+                return -EINVAL;
+
+        strncpy(stats_addr->version, BNX2FC_VERSION,
+                sizeof(stats_addr->version));
+        stats_addr->txq_size = BNX2FC_SQ_WQES_MAX;
+        stats_addr->rxq_size = BNX2FC_CQ_WQES_MAX;
+
+        return 0;
+}
 
 
 /**
@@ -1944,6 +1986,7 @@ static void bnx2fc_ulp_init(struct cnic_dev *dev)
         adapter_count++;
         mutex_unlock(&bnx2fc_dev_lock);
 
+        dev->fcoe_cap = &hba->fcoe_cap;
         clear_bit(BNX2FC_CNIC_REGISTERED, &hba->reg_with_cnic);
         rc = dev->register_device(dev, CNIC_ULP_FCOE,
                                                 (void *) hba);
@@ -2643,4 +2686,5 @@ static struct cnic_ulp_ops bnx2fc_cnic_cb = {
         .cnic_stop              = bnx2fc_ulp_stop,
         .indicate_kcqes         = bnx2fc_indicate_kcqe,
         .indicate_netevent      = bnx2fc_indicate_netevent,
+        .cnic_get_stats         = bnx2fc_ulp_get_stats,
 };