patch-2.1.30 linux/include/linux/hdlcdrv.h

Next file: linux/include/linux/icmpv6.h
Previous file: linux/include/linux/firewall.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.29/linux/include/linux/hdlcdrv.h linux/include/linux/hdlcdrv.h
@@ -7,6 +7,7 @@
 #ifndef _HDLCDRV_H
 #define _HDLCDRV_H
 
+#include <linux/version.h>
 #include <linux/sockios.h>
 #include <linux/version.h>
 #if LINUX_VERSION_CODE < 0x20119
@@ -38,23 +39,32 @@
 	               /* this just makes them send even if DCD is on */
 };	
 
-struct hdlcdrv_channel_state {
-	int ptt;
-	int dcd;
-	int ptt_keyed;
-#if LINUX_VERSION_CODE < 0x20119
-	struct enet_statistics stats;
-#else
-	struct net_device_stats stats;
+struct hdlcdrv_old_channel_state {
+  	int ptt;
+  	int dcd;
+  	int ptt_keyed;
+#if LINUX_VERSION_CODE < 0x20100
+  	struct enet_statistics stats;
 #endif
 };
 
+struct hdlcdrv_channel_state {
+ 	int ptt;
+ 	int dcd;
+ 	int ptt_keyed;
+ 	unsigned long tx_packets;
+ 	unsigned long tx_errors;
+ 	unsigned long rx_packets;
+ 	unsigned long rx_errors;
+};
+
 struct hdlcdrv_ioctl {
 	int cmd;
 	union {
 		struct hdlcdrv_params mp;
 		struct hdlcdrv_channel_params cp;
 		struct hdlcdrv_channel_state cs;
+		struct hdlcdrv_old_channel_state ocs;
 		unsigned int calibrate;
 		unsigned char bits;
 		char modename[128];
@@ -72,8 +82,9 @@
 #define HDLCDRVCTL_MODEMPARMASK      2  /* not handled by hdlcdrv */
 #define HDLCDRVCTL_GETCHANNELPAR    10
 #define HDLCDRVCTL_SETCHANNELPAR    11
-#define HDLCDRVCTL_GETSTAT          20
+#define HDLCDRVCTL_OLDGETSTAT       20
 #define HDLCDRVCTL_CALIBRATE        21
+#define HDLCDRVCTL_GETSTAT          22
 
 /*
  * these are mainly for debugging purposes

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