X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fnet%2Fsungem.h;h=00343226fb71e9a004189fdaeb6df5f1273006cc;hb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;hp=eed77bfe1b606ba5e1b3a62652af49a45360dc81;hpb=a2c21200f1c81b08cb55e417b68150bba439b646;p=linux-2.6.git

diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index eed77bfe1..00343226f 100644
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -60,6 +60,9 @@
 				 GREG_STAT_PCS | GREG_STAT_TXMAC | GREG_STAT_RXMAC | \
 				 GREG_STAT_MAC | GREG_STAT_MIF | GREG_STAT_PCIERR)
 
+#define GREG_STAT_NAPI		(GREG_STAT_TXALL  | GREG_STAT_TXINTME | \
+				 GREG_STAT_RXDONE | GREG_STAT_ABNORMAL)
+
 /* The layout of GREG_IMASK and GREG_IACK is identical to GREG_STAT.
  * Bits set in GREG_IMASK will prevent that interrupt type from being
  * signalled to the cpu.  GREG_IACK can be used to clear specific top-level
@@ -950,7 +953,8 @@ enum link_state {
 
 struct gem {
 	spinlock_t lock;
-	unsigned long regs;
+	spinlock_t tx_lock;
+	void __iomem *regs;
 	int rx_new, rx_old;
 	int tx_new, tx_old;
 
@@ -969,6 +973,7 @@ struct gem {
 	struct sk_buff *tx_skbs[RX_RING_SIZE];
 
 	u32			msg_enable;
+	u32			status;
 
 	struct net_device_stats net_stats;