patch-2.2.15 linux/drivers/net/sktr.h

• Lines: 40
• Date: Fri Apr 21 12:46:20 2000
• Orig file: v2.2.14/drivers/net/sktr.h
• Orig date: Wed Oct 20 01:12:39 1999

diff -u --new-file --recursive --exclude-from ../../exclude v2.2.14/drivers/net/sktr.h linux/drivers/net/sktr.h
@@ -16,8 +16,14 @@
 #define TR_RCF_LONGEST_FRAME_MASK 0x0070
 #define TR_RCF_FRAME4K 0x0030
 
+/* DeviceType values */
 #define SK_ISA 0
 #define SK_PCI 1
+#define PROT_ISA 2
+
+/* BusType values */
+#define BUS_TYPE_PCI	0
+#define BUS_TYPE_ISA	1
 
 /*------------------------------------------------------------------*/
 /*  Bit order for adapter communication with DMA		    */
@@ -1067,6 +1073,7 @@
 	unsigned short CMDqueue;
 
 	unsigned int DeviceType;
+	unsigned int BusType;
 
 	unsigned long AdapterOpenFlag:1;
 	unsigned long AdapterVirtOpenFlag:1;
@@ -1077,6 +1084,7 @@
 	unsigned long LobeWireFaultLogged:1;
 	unsigned long ReOpenInProgress:1;
 	unsigned long Sleeping:1;
+	unsigned long Sending:1;
 
 	unsigned long LastOpenStatus;
 	unsigned short CurrentRingStatus;
@@ -1086,7 +1094,7 @@
 	unsigned long LastSendTime;
 
 	struct sk_buff_head SendSkbQueue;
-	unsigned short QueueSkb;
+	atomic_t QueueSkb;
 
 	struct tr_statistics MacStat;	/* MAC statistics structure */