diff options
author | Sritej Velaga <sritej.velaga@qlogic.com> | 2011-08-29 12:50:28 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-08-29 22:52:50 -0400 |
commit | a2050c7eeef034521f34df9cb896e72ea6802331 (patch) | |
tree | 3935c29e29ad9cdcd2a69749fb438e769c5021f9 /drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | |
parent | df3cfbe30bcd8ddfbbac2d0893c53b6d048dd1f8 (diff) | |
download | linux-stable-a2050c7eeef034521f34df9cb896e72ea6802331.tar.gz linux-stable-a2050c7eeef034521f34df9cb896e72ea6802331.tar.bz2 linux-stable-a2050c7eeef034521f34df9cb896e72ea6802331.zip |
qlcnic: Add FLT entry for CO cards FW image region
The FLT entry for FW image region has changed for C0 cards.
Updated the driver to look at the right region in the FLT.
Signed-off-by: Sritej Velaga <sritej.velaga@qlogic.com>
Signed-off-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c')
-rw-r--r-- | drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c index b02859c7a23d..7f4b8e69079a 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_init.c @@ -686,7 +686,13 @@ qlcnic_check_flash_fw_ver(struct qlcnic_adapter *adapter) u32 ver = -1, min_ver; int ret; - ret = qlcnic_get_flt_entry(adapter, QLCNIC_FW_IMAGE_REGION, &fw_entry); + if (adapter->ahw->revision_id == QLCNIC_P3P_C0) + ret = qlcnic_get_flt_entry(adapter, QLCNIC_C0_FW_IMAGE_REGION, + &fw_entry); + else + ret = qlcnic_get_flt_entry(adapter, QLCNIC_B0_FW_IMAGE_REGION, + &fw_entry); + if (!ret) /* 0-4:-signature, 4-8:-fw version */ qlcnic_rom_fast_read(adapter, fw_entry.start_addr + 4, |