diff options
| author | Divy Le Ray <divy@chelsio.com> | 2008-12-16 01:51:47 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-16 01:51:47 -0800 |
| commit | 8207befa199c9ade670d1cf9a5bcdc76310751bd (patch) | |
| tree | 4ba183ae8406744f5c37f9e1fd740948a0ba678a /drivers/net/cxgb3/cxgb3_main.c | |
| parent | 5ad258c0a85a7cc03c46874e8a26c7e9b4dfb90d (diff) | |
| download | talos-op-linux-8207befa199c9ade670d1cf9a5bcdc76310751bd.tar.gz talos-op-linux-8207befa199c9ade670d1cf9a5bcdc76310751bd.zip | |
cxgb3: untie strict FW matching
The NIC driver can work with mutliple versions of the FW.
Let the driver load when the embedded FW does not match,
and the FW update mechanism failed.
The iWARP module will make its own loading decision.
Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/cxgb3/cxgb3_main.c')
| -rw-r--r-- | drivers/net/cxgb3/cxgb3_main.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c index 9e8727c5eced..2847f947499d 100644 --- a/drivers/net/cxgb3/cxgb3_main.c +++ b/drivers/net/cxgb3/cxgb3_main.c @@ -958,21 +958,22 @@ release_tpsram: static int cxgb_up(struct adapter *adap) { int err; - int must_load; if (!(adap->flags & FULL_INIT_DONE)) { - err = t3_check_fw_version(adap, &must_load); + err = t3_check_fw_version(adap); if (err == -EINVAL) { err = upgrade_fw(adap); - if (err && must_load) - goto out; + CH_WARN(adap, "FW upgrade to %d.%d.%d %s\n", + FW_VERSION_MAJOR, FW_VERSION_MINOR, + FW_VERSION_MICRO, err ? "failed" : "succeeded"); } - err = t3_check_tpsram_version(adap, &must_load); + err = t3_check_tpsram_version(adap); if (err == -EINVAL) { err = update_tpsram(adap); - if (err && must_load) - goto out; + CH_WARN(adap, "TP upgrade to %d.%d.%d %s\n", + TP_VERSION_MAJOR, TP_VERSION_MINOR, + TP_VERSION_MICRO, err ? "failed" : "succeeded"); } /* |
