Patchwork sky2: print Optima chip name

login
register
mail settings
Submitter stephen hemminger
Date Dec. 14, 2009, 6:33 p.m.
Message ID <20091214103347.691d7f3d@nehalam>
Download mbox | patch
Permalink /patch/41119/
State Accepted
Delegated to: David Miller
Headers show

Comments

stephen hemminger - Dec. 14, 2009, 6:33 p.m.
Off by one in name lookup makes Optima display as (chip 0xbc)

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>


--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - Dec. 15, 2009, 6:07 a.m.
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Mon, 14 Dec 2009 10:33:47 -0800

> Off by one in name lookup makes Optima display as (chip 0xbc)
> 
> Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>

Applied.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

--- a/drivers/net/sky2.c	2009-12-11 11:09:34.515284818 -0800
+++ b/drivers/net/sky2.c	2009-12-11 11:11:58.621253981 -0800
@@ -4530,7 +4530,7 @@  static const char *sky2_name(u8 chipid, 
 		"Optima",	/* 0xbc */
 	};
 
-	if (chipid >= CHIP_ID_YUKON_XL && chipid < CHIP_ID_YUKON_OPT)
+	if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OPT)
 		strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz);
 	else
 		snprintf(buf, sz, "(chip %#x)", chipid);