patch-2.1.17 linux/drivers/net/dgrs_i82596.h

• Lines: 91
• Date: Sat Dec 21 17:23:21 1996
• Orig file: v2.1.16/linux/drivers/net/dgrs_i82596.h
• Orig date: Sun Apr 21 11:40:09 1996

diff -u --recursive --new-file v2.1.16/linux/drivers/net/dgrs_i82596.h linux/drivers/net/dgrs_i82596.h
@@ -1,7 +1,7 @@
 /*
  *	i82596 ethernet controller bits and structures (little endian)
  *
- *	$Id: i82596.h,v 1.7 1996/03/18 15:31:47 rick Exp $
+ *	$Id: i82596.h,v 1.8 1996/09/03 11:19:03 rick Exp $
  */
 
 /************************************************************************/
@@ -73,10 +73,15 @@
 	union _I596_CB		*next;
 	I596_TBD		*tbdp;
 	ulong			count;	/* for speed */
-	uchar			addr[6];
-#if 1	/* We don't use these */
-	ushort			len;
-	uchar			data[1];
+
+	/* Application defined data follows structure... */
+
+#if 0	/* We don't use these intel defined ones */
+		uchar			addr[6];
+		ushort			len;
+		uchar			data[1];
+#else
+		ulong		dstchan;/* Used by multi-NIC mode */
 #endif
 } I596_TFD;
 
@@ -90,7 +95,7 @@
 /************************************************************************/
 typedef volatile struct _I596_RBD
 {
-#if INTEL_RENTENTIVE
+#if INTEL_RETENTIVE
 	ushort			count;	/* Length of data in buf */
 	ushort			offset;
 #else
@@ -98,13 +103,15 @@
 #endif
 	vol struct _I596_RBD	*next;	/* Next buffer descriptor in list */
 	uchar			*buf;	/* Data buffer */
-#if INTEL_RENTENTIVE
+#if INTEL_RETENTIVE
 	ushort			size;	/* Size of buf (constant) */
 	ushort			zero;
 #else
 	ulong			size;	/* Size of buf (constant) */
 #endif
-	/* application defined data */
+
+	/* Application defined data follows structure... */
+
 	uchar			chan;
 	uchar			refcnt;
 	ushort			len;
@@ -129,10 +136,15 @@
 	vol struct _I596_RBD	*rbdp;
 	ushort			count;	/* Len of data in RFD: always 0 */
 	ushort			size;	/* Size of RFD buffer: always 0 */
-#	if 1	/* We don't use these */
+
+	/* Application defined data follows structure... */
+
+#	if 0	/* We don't use these intel defined ones */
 		uchar		addr[6];
 		ushort		len;
 		uchar		data[1];
+#	else
+		ulong		dstchan;/* Used by multi-nic mode */
 #	endif
 } I596_RFD;
 
@@ -381,7 +393,7 @@
 	/* cmd halfword values */
 #define	I596_SCB_ACK		0xF000	/* ACKNOWLEDGMENTS */
 #define	I596_SCB_ACK_CX		0x8000	/* Ack command completion */
-#define	I596_SCB_ACK_FR		0x4000	/* Ack received frame */
+#define	I596_SCB_ACK_FR		0x4000	/* Ack recieved frame */
 #define	I596_SCB_ACK_CNA	0x2000	/* Ack command unit not active */
 #define	I596_SCB_ACK_RNR	0x1000	/* Ack rcv unit not ready */
 #define	I596_SCB_ACK_ALL	0xF000	/* Ack everything */
@@ -407,7 +419,7 @@
 	/* status halfword values */
 #define	I596_SCB_STAT		0xF000	/* STATUS */
 #define	I596_SCB_CX		0x8000	/* command completion */
-#define	I596_SCB_FR		0x4000	/* received frame */
+#define	I596_SCB_FR		0x4000	/* recieved frame */
 #define	I596_SCB_CNA		0x2000	/* command unit not active */
 #define	I596_SCB_RNR		0x1000	/* rcv unit not ready */