diff options
author | Divy Le Ray <divy@chelsio.com> | 2007-09-05 15:58:09 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 16:51:03 -0700 |
commit | a5a3b4601bfa3c7671944067d4e4b04bf647e6d9 (patch) | |
tree | 6dc3b626a855bb85fa724041b2fd4369facdada3 /drivers/net/cxgb3/cxgb3_main.c | |
parent | 34c6417b7087a4818e7dca2e5d66c3361cee80a1 (diff) | |
download | op-kernel-dev-a5a3b4601bfa3c7671944067d4e4b04bf647e6d9.zip op-kernel-dev-a5a3b4601bfa3c7671944067d4e4b04bf647e6d9.tar.gz |
cxgb3 - Firmware update
Update firmware version.
Allow the driver to be up and running with older FW image
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
-rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 3ee465d..8f1d602 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -797,11 +797,12 @@ static int cxgb_up(struct adapter *adap) int must_load; if (!(adap->flags & FULL_INIT_DONE)) { - err = t3_check_fw_version(adap); - if (err == -EINVAL) + err = t3_check_fw_version(adap, &must_load); + if (err == -EINVAL) { err = upgrade_fw(adap); - if (err) - goto out; + if (err && must_load) + goto out; + } err = t3_check_tpsram_version(adap, &must_load); if (err == -EINVAL) { |