patch-2.1.31 linux/drivers/net/ibmtr.h

Next file: linux/drivers/net/loopback.c
Previous file: linux/drivers/net/ibmtr.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.30/linux/drivers/net/ibmtr.h linux/drivers/net/ibmtr.h
@@ -200,11 +200,13 @@
 	unsigned short exsap_station_id;
 	unsigned short global_int_enable;
 	struct sk_buff *current_skb;
-	struct tr_statistics tr_stats;
+	struct net_device_stats tr_stats;
 	unsigned char auto_ringspeedsave;
 	open_state open_status;
 	unsigned char readlog_pending;
 	unsigned short adapter_int_enable; /* Adapter-specific int enable */
+        struct timer_list tr_timer;
+	__u32 func_addr;
 };
 
 /* token ring adapter commands */
@@ -213,7 +215,7 @@
 #define DIR_OPEN_ADAPTER 	0x03 /* struct dir_open_adapter */
 #define DIR_CLOSE_ADAPTER   	0x04
 #define DIR_SET_GRP_ADDR    	0x06
-#define DIR_SET_FUNC_ADDR   	0x07
+#define DIR_SET_FUNC_ADDR   	0x07 /* struct srb_set_funct_addr */
 #define DIR_READ_LOG 		0x08 /* struct srb_read_log */
 #define DLC_OPEN_SAP 		0x15 /* struct dlc_open_sap */
 #define DLC_CLOSE_SAP       	0x16
@@ -225,8 +227,8 @@
 
 /* DIR_OPEN_ADAPTER options */
 #define OPEN_PASS_BCON_MAC 0x0100
-#define NUM_RCV_BUF 16
-#define RCV_BUF_LEN 136
+#define NUM_RCV_BUF 3
+#define RCV_BUF_LEN 1024
 #define DHB_LENGTH 2048
 #define NUM_DHB 2
 #define DLC_MAX_SAP 2
@@ -396,7 +398,7 @@
 };
 
 struct rec_buf {
-	unsigned char reserved1[2];
+  /*	unsigned char reserved1[2]; */
 	__u16 buf_ptr;
 	unsigned char reserved2;
 	__u16 buf_len;
@@ -424,5 +426,13 @@
 	unsigned char command;
 	unsigned char reserved1;
 	unsigned char ret_code;
+};
+
+struct srb_set_funct_addr {
+	unsigned char command;
+	unsigned char reserved1;
+	unsigned char ret_code;
+	unsigned char reserved2[3];
+	__u32 funct_address;
 };
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov