summaryrefslogtreecommitdiffstats
path: root/drivers/net/jme.h
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2011-02-13 18:27:34 +0000
committerDavid S. Miller <davem@davemloft.net>2011-02-13 20:43:20 -0800
commit19d96017d1b5b1c9b709bc21a398ea793256644c (patch)
tree646eb220082285d32e7530dcc6260c881d69c1cb /drivers/net/jme.h
parentafc6151a78a43bdca5f64a8bd3e3c13837580c54 (diff)
downloadblackbird-op-linux-19d96017d1b5b1c9b709bc21a398ea793256644c.tar.gz
blackbird-op-linux-19d96017d1b5b1c9b709bc21a398ea793256644c.zip
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 {
u32 rx_ring_mask;
u8 mrrs;
unsigned int fpgaver;
- unsigned int chiprev;
- u8 rev;
+ u8 chiprev;
+ u8 chip_main_rev;
+ u8 chip_sub_rev;
+ u8 pcirev;
u32 msg_enable;
struct ethtool_cmd old_ecmd;
unsigned int old_mtu;
@@ -1184,7 +1186,7 @@ enum jme_phy_reg17_vals {
/*
* Workaround
*/
-static inline int is_buggy250(unsigned short device, unsigned int chiprev)
+static inline int is_buggy250(unsigned short device, u8 chiprev)
{
return device == PCI_DEVICE_ID_JMICRON_JMC250 && chiprev == 0x11;
}
OpenPOWER on IntegriCloud