be2net: cleanup be_get_drvinfo()

Removing the be_cmd_get_fw_ver() query from be_get_drvinfo() and invoking
the same from be_setup() and/or post firmware download.

Signed-off-by: Kalesh AP <kalesh.purayil@emulex.com>
Signed-off-by: Somnath Kotur <somnath.kotur@emulex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 8 insertions, 7 deletions

diff --git a/drivers/net/ethernet/emulex/benet/be.h b/drivers/net/ethernet/emulex/benet/be.h
index f544b297c9ab..edce38bf83c9 100644
--- a/drivers/net/ethernet/emulex/benet/be.h
+++ b/drivers/net/ethernet/emulex/benet/be.h
@@ -397,6 +397,7 @@ struct be_adapter {
         u32 cmd_privileges;
         /* Ethtool knobs and info */
         char fw_ver[FW_VER_LEN];
+        char fw_on_flash[FW_VER_LEN];
         int if_handle;          /* Used to configure filtering */
         u32 *pmac_id;           /* MAC addr handle used by BE card */
         u32 beacon_state;       /* for set_phys_id */
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
index 3d4461adb3b4..f3ee07758198 100644
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
@@ -177,19 +177,15 @@ static void be_get_drvinfo(struct net_device *netdev,
                                 struct ethtool_drvinfo *drvinfo)
 {
         struct be_adapter *adapter = netdev_priv(netdev);
-        char fw_on_flash[FW_VER_LEN];
-
-        memset(fw_on_flash, 0 , sizeof(fw_on_flash));
-        be_cmd_get_fw_ver(adapter, adapter->fw_ver, fw_on_flash);
 
         strlcpy(drvinfo->driver, DRV_NAME, sizeof(drvinfo->driver));
         strlcpy(drvinfo->version, DRV_VER, sizeof(drvinfo->version));
-        if (!memcmp(adapter->fw_ver, fw_on_flash, FW_VER_LEN))
+        if (!memcmp(adapter->fw_ver, adapter->fw_on_flash, FW_VER_LEN))
                 strlcpy(drvinfo->fw_version, adapter->fw_ver,
                         sizeof(drvinfo->fw_version));
         else
                 snprintf(drvinfo->fw_version, sizeof(drvinfo->fw_version),
-                         "%s [%s]", adapter->fw_ver, fw_on_flash);
+                         "%s [%s]", adapter->fw_ver, adapter->fw_on_flash);
 
         strlcpy(drvinfo->bus_info, pci_name(adapter->pdev),
                 sizeof(drvinfo->bus_info));
diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index 3d5e1a8929ae..d1580823c286 100644
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -3193,7 +3193,7 @@ static int be_setup(struct be_adapter *adapter)
         if (status)
                 goto err;
 
-        be_cmd_get_fw_ver(adapter, adapter->fw_ver, NULL);
+        be_cmd_get_fw_ver(adapter, adapter->fw_ver, adapter->fw_on_flash);
 
         if (adapter->vlans_added)
                 be_vid_config(adapter);
@@ -3785,6 +3785,10 @@ int be_load_fw(struct be_adapter *adapter, u8 *fw_file)
         else
                 status = be_fw_download(adapter, fw);
 
+        if (!status)
+                be_cmd_get_fw_ver(adapter, adapter->fw_ver,
+                                  adapter->fw_on_flash);
+
 fw_exit:
         release_firmware(fw);
         return status;