3 files changed, 14 insertions, 11 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index d266c86a53f7..5b622993ff17 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -110,6 +110,7 @@ static inline char *nic_name(struct pci_dev *pdev)
 #define MAX_RX_POST             BE_NAPI_WEIGHT /* Frags posted at a time */
 #define RX_FRAGS_REFILL_WM      (RX_Q_LEN - MAX_RX_POST)
 
+#define MAX_VFS                 30 /* Max VFs supported by BE3 FW */
 #define FW_VER_LEN              32
 
 struct be_dma_mem {
diff --git a/drivers/net/ethernet/emulex/benet/be_cmds.c b/drivers/net/ethernet/emulex/benet/be_cmds.c
index 8c63d06ab12b..701b3e9a715b 100644
--- a/drivers/net/ethernet/emulex/benet/be_cmds.c
+++ b/drivers/net/ethernet/emulex/benet/be_cmds.c
@@ -120,7 +120,7 @@ static int be_mcc_compl_process(struct be_adapter *adapter,
 
                 if (compl_status == MCC_STATUS_UNAUTHORIZED_REQUEST) {
                         dev_warn(&adapter->pdev->dev,
-                                 "opcode %d-%d is not permitted\n",
+                                 "VF is not privileged to issue opcode %d-%d\n",
                                  opcode, subsystem);
                 } else {
                         extd_status = (compl->status >> CQE_STATUS_EXTD_SHIFT) &
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 78b8aa8069f0..111dc8813f68 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -2176,8 +2176,7 @@ static uint be_num_rss_want(struct be_adapter *adapter)
 {
         u32 num = 0;
         if ((adapter->function_caps & BE_FUNCTION_CAPS_RSS) &&
-             !sriov_want(adapter) && be_physfn(adapter) &&
-             !be_is_mc(adapter)) {
+             !sriov_want(adapter) && be_physfn(adapter)) {
                 num = (adapter->be3_native) ? BE3_MAX_RSS_QS : BE2_MAX_RSS_QS;
                 num = min_t(u32, num, (u32)netif_get_num_default_rss_queues());
         }
@@ -2646,8 +2645,8 @@ static int be_vf_setup(struct be_adapter *adapter)
         }
 
         for_all_vfs(adapter, vf_cfg, vf) {
-                status = be_cmd_link_status_query(adapter, NULL, &lnk_speed,
-                                                  NULL, vf + 1);
+                lnk_speed = 1000;
+                status = be_cmd_set_qos(adapter, lnk_speed, vf + 1);
                 if (status)
                         goto err;
                 vf_cfg->tx_rate = lnk_speed * 10;
@@ -2724,6 +2723,8 @@ static int be_get_config(struct be_adapter *adapter)
         if (pos) {
                 pci_read_config_word(adapter->pdev, pos + PCI_SRIOV_TOTAL_VF,
                                      &dev_num_vfs);
+                if (!lancer_chip(adapter))
+                        dev_num_vfs = min_t(u16, dev_num_vfs, MAX_VFS);
                 adapter->dev_num_vfs = dev_num_vfs;
         }
         return 0;
@@ -3437,6 +3438,7 @@ static void be_ctrl_cleanup(struct be_adapter *adapter)
         if (mem->va)
                 dma_free_coherent(&adapter->pdev->dev, mem->size, mem->va,
                                   mem->dma);
+        kfree(adapter->pmac_id);
 }
 
 static int be_ctrl_init(struct be_adapter *adapter)
@@ -3473,6 +3475,12 @@ static int be_ctrl_init(struct be_adapter *adapter)
         }
         memset(rx_filter->va, 0, rx_filter->size);
 
+        /* primary mac needs 1 pmac entry */
+        adapter->pmac_id = kcalloc(adapter->max_pmac_cnt + 1,
+                                   sizeof(*adapter->pmac_id), GFP_KERNEL);
+        if (!adapter->pmac_id)
+                return -ENOMEM;
+
         mutex_init(&adapter->mbox_lock);
         spin_lock_init(&adapter->mcc_lock);
         spin_lock_init(&adapter->mcc_cq_lock);
@@ -3609,12 +3617,6 @@ static int be_get_initial_config(struct be_adapter *adapter)
         else
                 adapter->max_pmac_cnt = BE_VF_UC_PMAC_COUNT;
 
-        /* primary mac needs 1 pmac entry */
-        adapter->pmac_id = kcalloc(adapter->max_pmac_cnt + 1,
-                                  sizeof(u32), GFP_KERNEL);
-        if (!adapter->pmac_id)
-                return -ENOMEM;
-
         status = be_cmd_get_cntl_attributes(adapter);
         if (status)
                 return status;