[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20100131125833.GC13435@rhlx01.hs-esslingen.de>
Date: Sun, 31 Jan 2010 13:58:33 +0100
From: Andreas Mohr <andi@...as.de>
To: David Miller <davem@...emloft.net>, Arnd Bergmann <arnd@...db.de>,
David Hollis <dhollis@...ehollis.com>,
Phil Chang <pchang23@...global.net>
Cc: netdev@...r.kernel.org, linux-usb@...r.kernel.org
Subject: [PATCH 3/4] MCS7830 USB-Ether: change register define
ChangeLog:
- rename register, add comment
Signed-off-by: Andreas Mohr <andi@...as.de>
Index: linux-2.6.33-rc4/drivers/net/usb/mcs7830.c
===================================================================
--- linux-2.6.33-rc4.orig/drivers/net/usb/mcs7830.c 2010-01-31 12:34:45.000000000 +0100
+++ linux-2.6.33-rc4/drivers/net/usb/mcs7830.c 2010-01-31 12:34:51.000000000 +0100
@@ -85,6 +85,7 @@
HIF_REG_PHY_CMD2_PEND_FLAG_BIT = 0x80,
HIF_REG_PHY_CMD2_READY_FLAG_BIT = 0x40,
HIF_REG_CONFIG = 0x0e,
+ /* hmm, spec sez: "R/W", "Except bit 3" (likely TXENABLE). */
HIF_REG_CONFIG_CFG = 0x80,
HIF_REG_CONFIG_SPEED100 = 0x40,
HIF_REG_CONFIG_FULLDUPLEX_ENABLE = 0x20,
@@ -94,7 +95,7 @@
HIF_REG_CONFIG_ALLMULTICAST = 0x02,
HIF_REG_CONFIG_PROMISCUOUS = 0x01,
HIF_REG_ETHERNET_ADDR = 0x0f,
- HIF_REG_22 = 0x15,
+ HIF_REG_FRAME_DROP_COUNTER = 0x15, /* 0..ff; reset: 0 */
HIF_REG_PAUSE_THRESHOLD = 0x16,
HIF_REG_PAUSE_THRESHOLD_DEFAULT = 0,
};
@@ -334,7 +335,7 @@
{
u8 dummy[2];
int ret;
- ret = mcs7830_get_reg(dev, HIF_REG_22, 2, dummy);
+ ret = mcs7830_get_reg(dev, HIF_REG_FRAME_DROP_COUNTER, 2, dummy);
if (ret > 0)
return 2; /* Rev C or later */
return 1; /* earlier revision */
--
GNU/Linux. It's not the software that's free, it's you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists