Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[safe/jmp/linux-2.6] / drivers / net / smsc911x.h

diff --git a/drivers/net/smsc911x.h b/drivers/net/smsc911x.h
index f818cf0..b5716bd 100644 (file)
--- a/drivers/net/smsc911x.h
+++ b/drivers/net/smsc911x.h
@@ -61,9 +61,6 @@
 #define SMSC_ASSERT_MAC_LOCK(pdata) do {} while (0)
 #endif                         /* CONFIG_DEBUG_SPINLOCK */
 
-#define FLOW_CTRL_TX           (1)
-#define FLOW_CTRL_RX           (2)
-
 /* SMSC911x registers and bitfields */
 #define RX_DATA_FIFO                   0x00
 
@@ -84,12 +81,19 @@
 
 #define RX_STATUS_FIFO                 0x40
 #define RX_STS_ES_                     0x00008000
+#define RX_STS_LENGTH_ERR_             0x00001000
 #define RX_STS_MCAST_                  0x00000400
+#define RX_STS_FRAME_TYPE_             0x00000020
+#define RX_STS_CRC_ERR_                        0x00000002
 
 #define RX_STATUS_FIFO_PEEK            0x44
 
 #define TX_STATUS_FIFO                 0x48
 #define TX_STS_ES_                     0x00008000
+#define TX_STS_LOST_CARRIER_           0x00000800
+#define TX_STS_NO_CARRIER_             0x00000400
+#define TX_STS_LATE_COL_               0x00000200
+#define TX_STS_EXCESS_COL_             0x00000100
 
 #define TX_STATUS_FIFO_PEEK            0x4C