aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.h
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2011-02-13 13:27:34 -0500
committerDavid S. Miller <davem@davemloft.net>2011-02-13 23:43:20 -0500
commit19d96017d1b5b1c9b709bc21a398ea793256644c (patch)
tree646eb220082285d32e7530dcc6260c881d69c1cb /drivers/net/jme.h
parentafc6151a78a43bdca5f64a8bd3e3c13837580c54 (diff)
jme: Extract main and sub chip revision
Get the main and sub chip revision for later workaround use. Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/jme.h')
-rw-r--r--drivers/net/jme.h8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/jme.h b/drivers/net/jme.h
index eac09264bf2a..32b2a9ddbcd6 100644
--- a/drivers/net/jme.h
+++ b/drivers/net/jme.h
@@ -411,8 +411,10 @@ struct jme_adapter {
411 u32 rx_ring_mask; 411 u32 rx_ring_mask;
412 u8 mrrs; 412 u8 mrrs;
413 unsigned int fpgaver; 413 unsigned int fpgaver;
414 unsigned int chiprev; 414 u8 chiprev;
415 u8 rev; 415 u8 chip_main_rev;
416 u8 chip_sub_rev;
417 u8 pcirev;
416 u32 msg_enable; 418 u32 msg_enable;
417 struct ethtool_cmd old_ecmd; 419 struct ethtool_cmd old_ecmd;
418 unsigned int old_mtu; 420 unsigned int old_mtu;
@@ -1184,7 +1186,7 @@ enum jme_phy_reg17_vals {
1184/* 1186/*
1185 * Workaround 1187 * Workaround
1186 */ 1188 */
1187static inline int is_buggy250(unsigned short device, unsigned int chiprev) 1189static inline int is_buggy250(unsigned short device, u8 chiprev)
1188{ 1190{
1189 return device == PCI_DEVICE_ID_JMICRON_JMC250 && chiprev == 0x11; 1191 return device == PCI_DEVICE_ID_JMICRON_JMC250 && chiprev == 0x11;
1190} 1192}