diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/cxgb3/t3_hw.c | 10 | ||||
-rw-r--r-- | drivers/net/cxgb3/version.h | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c index 522834c42ae7..d7b991b7ed78 100644 --- 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) | |||
988 | CH_ERR(adapter, "found wrong FW version(%u.%u), " | 988 | CH_ERR(adapter, "found wrong FW version(%u.%u), " |
989 | "driver needs version %u.%u\n", major, minor, | 989 | "driver needs version %u.%u\n", major, minor, |
990 | FW_VERSION_MAJOR, FW_VERSION_MINOR); | 990 | FW_VERSION_MAJOR, FW_VERSION_MINOR); |
991 | else { | 991 | else if (minor < FW_VERSION_MINOR) { |
992 | *must_load = 0; | 992 | *must_load = 0; |
993 | CH_WARN(adapter, "found wrong FW minor version(%u.%u), " | 993 | CH_WARN(adapter, "found old FW minor version(%u.%u), " |
994 | "driver compiled for version %u.%u\n", major, minor, | ||
995 | FW_VERSION_MAJOR, FW_VERSION_MINOR); | ||
996 | } else { | ||
997 | CH_WARN(adapter, "found newer FW version(%u.%u), " | ||
994 | "driver compiled for version %u.%u\n", major, minor, | 998 | "driver compiled for version %u.%u\n", major, minor, |
995 | FW_VERSION_MAJOR, FW_VERSION_MINOR); | 999 | FW_VERSION_MAJOR, FW_VERSION_MINOR); |
1000 | return 0; | ||
996 | } | 1001 | } |
997 | |||
998 | return -EINVAL; | 1002 | return -EINVAL; |
999 | } | 1003 | } |
1000 | 1004 | ||
diff --git a/drivers/net/cxgb3/version.h b/drivers/net/cxgb3/version.h index ef1c6339c806..229303ff6a39 100644 --- a/drivers/net/cxgb3/version.h +++ b/drivers/net/cxgb3/version.h | |||
@@ -38,7 +38,7 @@ | |||
38 | #define DRV_VERSION "1.0-ko" | 38 | #define DRV_VERSION "1.0-ko" |
39 | 39 | ||
40 | /* Firmware version */ | 40 | /* Firmware version */ |
41 | #define FW_VERSION_MAJOR 4 | 41 | #define FW_VERSION_MAJOR 5 |
42 | #define FW_VERSION_MINOR 6 | 42 | #define FW_VERSION_MINOR 0 |
43 | #define FW_VERSION_MICRO 0 | 43 | #define FW_VERSION_MICRO 0 |
44 | #endif /* __CHELSIO_VERSION_H */ | 44 | #endif /* __CHELSIO_VERSION_H */ |