diff options
| author |   Somnath Kotur <somnath.kotur@emulex.com> | 2013-05-26 21:08:36 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-05-27 22:27:02 -0700 |
| commit | eeb65cedd78ebd375608d71d703e6b0b9296efbd (patch) | |
| tree | 2248f522ec63fea57be206ce8ce24bf2593b1b98 /drivers/net/ethernet/emulex/benet/be_main.c | |
| parent | bnx2x: Change to D3hot only on removal (diff) | |
| download | linux-dev-eeb65cedd78ebd375608d71d703e6b0b9296efbd.tar.xz linux-dev-eeb65cedd78ebd375608d71d703e6b0b9296efbd.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/emulex/benet/be_main.c')
| -rw-r--r-- | drivers/net/ethernet/emulex/benet/be_main.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; |