cxgb3 - FW upgrade

Bump up FW version to 5.0.
Do not downgrade FW within the same major version range.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
index 522834c42ae7e20af003101ffba1fdaf7ab0ff31..d7b991b7ed7883688df25d19556c679b6b7212ef 100644 (file)
--- a/drivers/net/cxgb3/t3_hw.c
+++ b/drivers/net/cxgb3/t3_hw.c
@@ -988,13 +988,17 @@ int t3_check_fw_version(struct adapter *adapter, int *must_load)
                CH_ERR(adapter, "found wrong FW version(%u.%u), "
                       "driver needs version %u.%u\n", major, minor,
                       FW_VERSION_MAJOR, FW_VERSION_MINOR);
-       else {
+       else if (minor < FW_VERSION_MINOR) {
                *must_load = 0;
-               CH_WARN(adapter, "found wrong FW minor version(%u.%u), "
+               CH_WARN(adapter, "found old FW minor version(%u.%u), "
+                       "driver compiled for version %u.%u\n", major, minor,
+                       FW_VERSION_MAJOR, FW_VERSION_MINOR);
+       } else {
+               CH_WARN(adapter, "found newer FW version(%u.%u), "
                        "driver compiled for version %u.%u\n", major, minor,
                        FW_VERSION_MAJOR, FW_VERSION_MINOR);
+                       return 0;
        }
-
        return -EINVAL;
 }
 

diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h
index ef1c6339c80607437dee90ce103257c5114df7c8..229303ff6a39016c0fd3823d7e5212ecc77fcaff 100644 (file)
--- a/drivers/net/cxgb3/version.h
+++ b/drivers/net/cxgb3/version.h
@@ -38,7 +38,7 @@
 #define DRV_VERSION "1.0-ko"
 
 /* Firmware version */
-#define FW_VERSION_MAJOR 4
-#define FW_VERSION_MINOR 6
+#define FW_VERSION_MAJOR 5
+#define FW_VERSION_MINOR 0
 #define FW_VERSION_MICRO 0
 #endif                         /* __CHELSIO_VERSION_H */