bnx2x: Support of PF driver of a VF acquire request

When a VF is probed by the VF driver, the VF driver sends an
'acquire' request over the VF <-> PF channel for the resources
it needs to operate (interrupts, queues, etc).
The PF driver either ratifies the request and allocates the resources,
responds with the maximum values it will allow the VF to acquire,
or fails the request entirely if there is a problem.

Signed-off-by: Ariel Elior <ariele@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 2 insertions, 11 deletions

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index b7c82f9e452a..292634f0e90b 100644
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -817,21 +817,12 @@ static void bnx2x_get_drvinfo(struct net_device *dev,
                               struct ethtool_drvinfo *info)
 {
         struct bnx2x *bp = netdev_priv(dev);
-        u8 phy_fw_ver[PHY_FW_VER_LEN];
 
         strlcpy(info->driver, DRV_MODULE_NAME, sizeof(info->driver));
         strlcpy(info->version, DRV_MODULE_VERSION, sizeof(info->version));
 
-        phy_fw_ver[0] = '\0';
-        bnx2x_get_ext_phy_fw_version(&bp->link_params,
-                                     phy_fw_ver, PHY_FW_VER_LEN);
-        strlcpy(info->fw_version, bp->fw_ver, sizeof(info->fw_version));
-        snprintf(info->fw_version + strlen(bp->fw_ver), 32 - strlen(bp->fw_ver),
-                 "bc %d.%d.%d%s%s",
-                 (bp->common.bc_ver & 0xff0000) >> 16,
-                 (bp->common.bc_ver & 0xff00) >> 8,
-                 (bp->common.bc_ver & 0xff),
-                 ((phy_fw_ver[0] != '\0') ? " phy " : ""), phy_fw_ver);
+        bnx2x_fill_fw_str(bp, info->fw_version, sizeof(info->fw_version));
+
         strlcpy(info->bus_info, pci_name(bp->pdev), sizeof(info->bus_info));
         info->n_stats = BNX2X_NUM_STATS;
         info->testinfo_len = BNX2X_NUM_TESTS(bp);