From 0b2459d20f3298f878a2d9111fc420db5547f3dc Mon Sep 17 00:00:00 2001 From: Divy Le Ray Date: Fri, 16 Nov 2007 11:22:00 -0800 Subject: [PATCH] --- yaml --- r: 78957 b: refs/heads/master c: 273fa9042c44790388de7e2a1dab9a1164dd9d17 h: refs/heads/master i: 78955: cd296d805d7b466b3f6dd44351d5b2a4acae729b v: v3 --- [refs] | 2 +- trunk/drivers/net/cxgb3/t3_hw.c | 10 +++++++--- trunk/drivers/net/cxgb3/version.h | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index aacbe1c9b1c9..6fe72525052b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 91a6b50cf680cd693ee0faaab18a0b7383814d6b +refs/heads/master: 273fa9042c44790388de7e2a1dab9a1164dd9d17 diff --git a/trunk/drivers/net/cxgb3/t3_hw.c b/trunk/drivers/net/cxgb3/t3_hw.c index 522834c42ae7..d7b991b7ed78 100644 --- a/trunk/drivers/net/cxgb3/t3_hw.c +++ b/trunk/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/trunk/drivers/net/cxgb3/version.h b/trunk/drivers/net/cxgb3/version.h index ef1c6339c806..229303ff6a39 100644 --- a/trunk/drivers/net/cxgb3/version.h +++ b/trunk/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 */