diff options
| author | Navdeep Parhar <np@FreeBSD.org> | 2019-04-22 17:00:30 +0000 |
|---|---|---|
| committer | Navdeep Parhar <np@FreeBSD.org> | 2019-04-22 17:00:30 +0000 |
| commit | be7eaf979eb1ba8e66828fd1c59eb46e1f260b11 (patch) | |
| tree | b2c13980ab47af74fba47574156c306be99b955d /sys/dev | |
| parent | 680defa7cefe932be1a4d3f3bf97c6e5d2eb63e3 (diff) | |
Notes
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/cxgbe/t4_main.c | 27 |
1 files changed, 14 insertions, 13 deletions
diff --git a/sys/dev/cxgbe/t4_main.c b/sys/dev/cxgbe/t4_main.c index e5bf69c5f3e0..3c29438f447d 100644 --- a/sys/dev/cxgbe/t4_main.c +++ b/sys/dev/cxgbe/t4_main.c @@ -3529,19 +3529,6 @@ install_kld_firmware(struct adapter *sc, struct fw_h *card_fw, load_attempted = false; fw_install = t4_fw_install < 0 ? -t4_fw_install : t4_fw_install; - if (reason != NULL) - goto install; - - if ((sc->flags & FW_OK) == 0) { - - if (c == 0xffffffff) { - reason = "missing"; - goto install; - } - - return (0); - } - memcpy(&bundled_fw, drv_fw, sizeof(bundled_fw)); if (t4_fw_install < 0) { rc = load_fw_module(sc, &cfg, &fw); @@ -3558,6 +3545,20 @@ install_kld_firmware(struct adapter *sc, struct fw_h *card_fw, } d = be32toh(bundled_fw.fw_ver); + if (reason != NULL) + goto install; + + if ((sc->flags & FW_OK) == 0) { + + if (c == 0xffffffff) { + reason = "missing"; + goto install; + } + + rc = 0; + goto done; + } + if (!fw_compatible(card_fw, &bundled_fw)) { reason = "incompatible or unusable"; goto install; |
