The patch titled
cxgb3: firwmare update
has been added to the -mm tree. Its filename is
cxgb3-firwmare-update.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: cxgb3: firwmare update
From: Divy Le Ray <[EMAIL PROTECTED]>
Introduce FW micro version.
Bump up FW version to 3.3.0
Signed-off-by: Divy Le Ray <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/net/cxgb3/cxgb3_main.c | 4 ++--
drivers/net/cxgb3/version.h | 5 ++++-
2 files changed, 6 insertions(+), 3 deletions(-)
diff -puN drivers/net/cxgb3/cxgb3_main.c~cxgb3-firwmare-update
drivers/net/cxgb3/cxgb3_main.c
--- a/drivers/net/cxgb3/cxgb3_main.c~cxgb3-firwmare-update
+++ a/drivers/net/cxgb3/cxgb3_main.c
@@ -721,7 +721,7 @@ static void bind_qsets(struct adapter *a
}
}
-#define FW_FNAME "t3fw-%d.%d.bin"
+#define FW_FNAME "t3fw-%d.%d.%d.bin"
static int upgrade_fw(struct adapter *adap)
{
@@ -731,7 +731,7 @@ static int upgrade_fw(struct adapter *ad
struct device *dev = &adap->pdev->dev;
snprintf(buf, sizeof(buf), FW_FNAME, FW_VERSION_MAJOR,
- FW_VERSION_MINOR);
+ FW_VERSION_MINOR, FW_VERSION_MICRO);
ret = request_firmware(&fw, buf, dev);
if (ret < 0) {
dev_err(dev, "could not upgrade firmware: unable to load %s\n",
diff -puN drivers/net/cxgb3/version.h~cxgb3-firwmare-update
drivers/net/cxgb3/version.h
--- a/drivers/net/cxgb3/version.h~cxgb3-firwmare-update
+++ a/drivers/net/cxgb3/version.h
@@ -36,6 +36,9 @@
#define DRV_NAME "cxgb3"
/* Driver version */
#define DRV_VERSION "1.0-ko"
+
+/* Firmware version */
#define FW_VERSION_MAJOR 3
-#define FW_VERSION_MINOR 2
+#define FW_VERSION_MINOR 3
+#define FW_VERSION_MICRO 0
#endif /* __CHELSIO_VERSION_H */
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
cxgb3-safeguard-tcam-size-usage.patch
cxgb3-detect-nic-only-adapters.patch
cxgb3-tighten-xgmac-workaround.patch
cxgb3-firwmare-update.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
