Import newax25-2.4.3.patch.1.bz2HEADnewax25-2.4.3-1

And cleanup the *.orig and *.rej files and whitespace errors that are part
of the original patch.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

7 files changed, 328 insertions, 153 deletions

diff --git a/include/linux/ax25.h b/include/linux/ax25.h
index 9191445bb..f316c9960 100644
--- a/include/linux/ax25.h
+++ b/include/linux/ax25.h
@@ -6,8 +6,10 @@
 #ifndef	AX25_KERNEL_H
 #define	AX25_KERNEL_H
 
+#define AX25_NEW_DEVIF  1
+
 #define AX25_MTU	256
-#define AX25_MAX_DIGIS  8
+#define AX25_MAX_DIGIS	8
 
 #define AX25_WINDOW	1
 #define AX25_T1		2
@@ -35,6 +37,9 @@
 #define SIOCAX25DEVCTL          (SIOCPROTOPRIVATE+12)
 #define SIOCAX25GETINFO         (SIOCPROTOPRIVATE+13)
 
+#define AX25_SET_DEV_BITRATE    0
+#define AX25_SET_DEV_MODE       1
+
 #define AX25_SET_RT_IPMODE	2
 
 #define AX25_NOUID_DEFAULT	0
@@ -58,6 +63,59 @@ struct full_sockaddr_ax25 {
 	ax25_address	fsa_digipeater[AX25_MAX_DIGIS];
 };
 
+#define fsax25_family fsa_ax25.sax25_family
+#define fsax25_call   fsa_ax25.sax25_call
+#define fsax25_ndigis fsa_ax25.sax25_ndigis
+
+typedef struct {
+	ax25_address            addr;
+	ax25_address            digipeater[AX25_MAX_DIGIS];;
+	unsigned char           dcount;
+} ax25_path_t;
+
+typedef struct {
+	ax25_address            dest;
+	ax25_address            src;
+	ax25_address            digipeater[AX25_MAX_DIGIS];
+	unsigned char           dcount;
+	char                    lastrepeat;
+} ax25_addr_t;
+
+struct ax25_rtmsg {
+	char            port_name[32];
+	unsigned int    mode;
+	ax25_addr_t     addr;
+};
+
+struct ax25_armsg {
+	char            port_name[32];
+	unsigned int    ip_addr;
+	ax25_address    ax_addr;
+};
+
+struct ax25_pathmsg {
+	char            port_name[32];
+	unsigned int    mode;
+	ax25_path_t     path;
+};
+
+struct ax25_nlmsg {
+
+#define AX25_MSG_RTINFO 0
+#define AX25_MSG_ARINFO 1
+#define AX25_MSG_SETRT  2
+#define AX25_MSG_DELRT  3
+#define AX25_MSG_OPTRT  4
+	unsigned int msg_type;
+
+	union {
+		unsigned char raw[128-sizeof(unsigned int)];
+		struct ax25_rtmsg rtmsg;
+		struct ax25_armsg armsg;
+		struct ax25_pathmsg pathmsg;
+	} msg;
+};
+
 struct ax25_routes_struct {
 	ax25_address	port_addr;
 	ax25_address	dest_addr;
@@ -73,13 +131,11 @@ struct ax25_route_opt_struct {
 };
 
 struct ax25_ctl_struct {
-        ax25_address            port_addr;
-        ax25_address            source_addr;
-        ax25_address            dest_addr;
-        unsigned int            cmd;
-        unsigned long           arg;
-        unsigned char           digi_count;
-        ax25_address            digi_addr[AX25_MAX_DIGIS];
+	ax25_address	port_addr;
+	ax25_address	source_addr;
+	ax25_address	dest_addr;
+	unsigned int	cmd;
+	unsigned long	arg;
 };
 
 /* this will go away. Please do not export to user land */
diff --git a/include/linux/ax25_userdev.h b/include/linux/ax25_userdev.h
new file mode 100644
index 000000000..cc58a3e5e
--- /dev/null
+++ b/include/linux/ax25_userdev.h
@@ -0,0 +1,120 @@
+/*
+ *  AX.25 usermode device driver.
+ *  Copyright (C) 1999-2000 Maxim Krasnyansky <max_mk@yahoo.com>
+ *  Copyright 2001, by Joerg Reuter <jreuter@yaina.de>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *  GNU General Public License for more details.
+ *
+ */
+
+#ifndef __IF_AX25_UDEV_H
+#define __IF_AX25_UDEV_H
+
+#define AX25_UDEV_VER "0.1"
+#define AX25_UDEV_DEBUG
+
+/* Uncomment to enable debugging */
+/* #define AX25_UDEV_DEBUG 1 */
+
+#ifdef __KERNEL__
+
+#ifdef AX25_UDEV_DEBUG
+#define DBG  if(ax25_udev->debug)printk
+#define DBG1 if(debug==2)printk
+#else
+#define DBG( a... )
+#define DBG1( a... )
+#endif
+
+struct ax25_udev_struct {
+	char 			name[IFNAMSIZ];
+	unsigned long 		flags;
+
+	struct fasync_struct    *fasync;
+	wait_queue_head_t	read_wait;
+
+	struct net_device	dev;
+	struct sk_buff_head	txq;
+        struct net_device_stats	stats;
+	struct ax25_dev		ax25_dev;
+
+	struct {
+		int duplex;
+		int arbitration;
+	} capabilities;
+
+	struct {
+		int dcd:1;
+		int cts:1;
+		int rts:1;
+		int ptt:1;
+	} status;
+
+#ifdef AX25_UDEV_DEBUG
+	int debug;
+#endif
+};
+
+#endif /* __KERNEL__ */
+
+/* Number of devices */
+#define AX25_UDEV_MAX_DEV	255
+
+/* TX queue size */
+#define AX25_UDEV_TXQ_SIZE	10
+
+/* Max frame size */
+#define AX25_UDEV_MAX_FRAME	4096
+
+/* AX25_UDEV device flags */
+#define AX25_UDEV_TYPE_MASK	0x000f
+#define AX25_UDEV_FASYNC	0x0010
+#define AX25_UDEV_IFF_SET	0x1000
+
+/* AX25_UDEV IFF ioctl */
+#define AX25_UDEV_SETIFF	_IOW(0x25, 0, void *)
+#define AX25_UDEV_SETDEBUG	_IOW(0x25, 1, int)
+
+/* Packet layout:
+ *
+ * (int) packet_type
+ * (int) data
+ * ...
+ *
+ * Exception for AX25_UDEV_DATA:
+ * (int) 0
+ * (char) octet
+ * ...
+ *
+ */
+
+typedef enum ax25_user_dev_commands_e {
+	AX25_UDEV_DATA,
+	AX25_UDEV_CAPABILITIES,
+	AX25_UDEV_DCD_STATUS,
+	AX25_UDEV_CTS_STATUS,
+	AX25_UDEV_PTT_STATUS,
+	AX25_UDEV_SET_MAC_VALUE,
+	AX25_UDEV_REQUEST_RTS
+} ax25_user_dev_commands_t;
+
+typedef enum ax25_user_dev_capabilities_e {
+	AX25_UDEV_CAP_HALF_DUPLEX,
+	AX25_UDEV_CAP_FULL_DUPLEX,
+	AX25_UDEV_CAP_ADVANCED_ARBITRATION,
+	AX25_UDEV_CAP_OWN_ARBITRATION,
+	AX25_UDEV_CAP_SIMPLE_ARBITRATION
+} ax25_user_dev_capabilities_t;
+
+typedef int ax25_udev_pt_t;
+typedef int ax25_udev_val_t;
+
+#endif /* __IF_AX25_UDEV_H */
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 34c8dcb04..1fd9db550 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -33,6 +33,7 @@
 #define SGI_USEMACLONE	     151
 
 #define TUN_MINOR	     200
+#define AX25_UDEV_MINOR	     210
 
 extern int misc_init(void);
 
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 011caf23d..686ebda28 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -317,6 +317,7 @@ struct net_device
 	void                    *dn_ptr;        /* DECnet specific data */
 	void                    *ip6_ptr;       /* IPv6 specific data */
 	void			*ec_ptr;	/* Econet specific data	*/
+	void			*ax25_ptr;	/* AX.25 specific data  */
 
 	struct Qdisc		*qdisc;
 	struct Qdisc		*qdisc_sleeping;
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 2afb52e98..6eaaa86bf 100644
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -5,6 +5,7 @@
 #define NETLINK_SKIP		1	/* Reserved for ENskip  			*/
 #define NETLINK_USERSOCK	2	/* Reserved for user mode socket protocols 	*/
 #define NETLINK_FIREWALL	3	/* Firewalling hook				*/
+#define NETLINK_AX25		4	/* AX25 routing daemon hook */
 #define NETLINK_ARPD		8
 #define NETLINK_ROUTE6		11	/* af_inet6 route comm channel */
 #define NETLINK_IP6_FW		13
diff --git a/include/linux/scc.h b/include/linux/scc.h
index a896704e6..1ec441746 100644
--- a/include/linux/scc.h
+++ b/include/linux/scc.h
@@ -8,7 +8,7 @@
 /* selection of hardware types */
 
 #define PA0HZP		0x00	/* hardware type for PA0HZP SCC card and compatible */
-#define EAGLE		0x01    /* hardware type for EAGLE card */
+#define EAGLE         	0x01    /* hardware type for EAGLE card */
 #define PC100		0x02	/* hardware type for PC100 card */
 #define PRIMUS		0x04	/* hardware type for PRIMUS-PC (DG9BL) card */
 #define DRSI		0x08	/* hardware type for DRSI PC*Packet card */
@@ -22,87 +22,45 @@ enum SCC_ioctl_cmds {
 	SIOCSCCINI,
 	SIOCSCCCHANINI,
 	SIOCSCCSMEM,
-	SIOCSCCGKISS,
-	SIOCSCCSKISS,
+	SIOCSCCGMODEM,
+	SIOCSCCSMODEM,
 	SIOCSCCGSTAT,
 	SIOCSCCCAL
 };
 
-/* Device parameter control (from WAMPES) */
-
-enum L1_params {
-	PARAM_DATA,
-	PARAM_TXDELAY,
-	PARAM_PERSIST,
-	PARAM_SLOTTIME,
-	PARAM_TXTAIL,
-	PARAM_FULLDUP,
-	PARAM_SOFTDCD,		/* was: PARAM_HW */
-	PARAM_MUTE,		/* ??? */
-	PARAM_DTR,
-	PARAM_RTS,
-	PARAM_SPEED,
-	PARAM_ENDDELAY,		/* ??? */
-	PARAM_GROUP,
-	PARAM_IDLE,
-	PARAM_MIN,
-	PARAM_MAXKEY,
-	PARAM_WAIT,
-	PARAM_MAXDEFER,
-	PARAM_TX,
-	PARAM_HWEVENT = 31,
-	PARAM_RETURN = 255	/* reset kiss mode */
-};
-
-/* fulldup parameter */
+/* magic number */
 
-enum FULLDUP_modes {
-	KISS_DUPLEX_HALF,	/* normal CSMA operation */
-	KISS_DUPLEX_FULL,	/* fullduplex, key down trx after transmission */
-	KISS_DUPLEX_LINK,	/* fullduplex, key down trx after 'idletime' sec */
-	KISS_DUPLEX_OPTIMA	/* fullduplex, let the protocol layer control the hw */
-};
+#define SCC_MAGIC	0x8530		/* ;-) */
 
 /* misc. parameters */
 
 #define TIMER_OFF	65535U	/* to switch off timers */
-#define NO_SUCH_PARAM	65534U	/* param not implemented */
-
-/* HWEVENT parameter */
 
-enum HWEVENT_opts {
-	HWEV_DCD_ON,
-	HWEV_DCD_OFF,
-	HWEV_ALL_SENT
-};
-
-/* channel grouping */
+/* Tx/Rx clock sources */
 
-#define RXGROUP		0100	/* if set, only tx when all channels clear */
-#define TXGROUP		0200	/* if set, don't transmit simultaneously */
+typedef enum {
+	CLOCK_SOURCE_RTxC,	/* use RTxC pin */
+	CLOCK_SOURCE_TRxC,	/* use TRxC pin */
+	CLOCK_SOURCE_BRG,	/* use baud rate generator */
+	CLOCK_SOURCE_DPLL	/* use DPLL */
+} Scc_clock_sources;
 
-/* Tx/Rx clock sources */
+typedef enum {
+	TRXCP_MODE_IN,		/* TRxC pin is input */
+	TRXCP_MODE_TXC_OUT,	/* TRxC bears Tx clock */
+	TRXCP_MODE_BRG_OUT,	/* TRxC bears BRG output */
+	TRXCP_MODE_DPLL_OUT	/* TRxC bears DPLL */
 
-enum CLOCK_sources {
-	CLK_DPLL,	/* normal halfduplex operation */
-	CLK_EXTERNAL,	/* external clocking (G3RUH/DF9IC modems) */
-	CLK_DIVIDER,	/* Rx = DPLL, Tx = divider (fullduplex with */
-			/* modems without clock regeneration */
-	CLK_BRG		/* experimental fullduplex mode with DPLL/BRG for */
-			/* MODEMs without clock recovery */
-};
+} Scc_trxc_pin_modes;
 
 /* Tx state */
 
-enum TX_state {
+typedef enum {
 	TXS_IDLE,	/* Transmitter off, no data pending */
-	TXS_BUSY,	/* waiting for permission to send / tailtime */
+	TXS_TXDELAY,	/* waiting for transmitter keyed up */
 	TXS_ACTIVE,	/* Transmitter on, sending data */
-	TXS_NEWFRAME,	/* reset CRC and send (next) frame */
-	TXS_IDLE2,	/* Transmitter on, no data pending */
-	TXS_WAIT,	/* Waiting for Mintime to expire */
-	TXS_TIMEOUT	/* We had a transmission timeout */
-};
+	TXS_TAIL,	/* Transmition tail time */
+} Scc_tx_states;
 
 typedef unsigned long io_port;	/* type definition for an 'io port address' */
 
@@ -124,50 +82,22 @@ struct scc_stat {
 	unsigned int tx_under;	/* Transmitter Underruns */
 
 	unsigned int tx_state;	/* Transmitter state */
-	int tx_queued;		/* tx frames enqueued */
-
-	unsigned int maxqueue;	/* allocated tx_buffers */
 	unsigned int bufsize;	/* used buffersize */
 };
 
 struct scc_modem {
-	long speed;		/* Line speed, bps */
-	char clocksrc;		/* 0 = DPLL, 1 = external, 2 = divider */
-	char nrz;		/* NRZ instead of NRZI */	
-};
-
-struct scc_kiss_cmd {
-	int  	 command;	/* one of the KISS-Commands defined above */
-	unsigned param;		/* KISS-Param */
-};
-
-struct scc_hw_config {
-	io_port data_a;		/* data port channel A */
-	io_port ctrl_a;		/* control port channel A */
-	io_port data_b;		/* data port channel B */
-	io_port ctrl_b;		/* control port channel B */
-	io_port vector_latch;	/* INTACK-Latch (#) */
-	io_port	special;	/* special function port */
-
-	int	irq;		/* irq */
-	long	clock;		/* clock */
-	char	option;		/* command for function port */
-
-	char brand;		/* hardware type */
-	char escc;		/* use ext. features of a 8580/85180/85280 */
-};
-
-/* (#) only one INTACK latch allowed. */
-
-
-struct scc_mem_config {
-	unsigned int dummy;
-	unsigned int bufsize;
-};
-
-struct scc_calibrate {
-	unsigned int time;
-	unsigned char pattern;
+	int	rx_speed;		/* Line speed, bps */
+	int	tx_speed;
+	int	rx_clock_source;	/* see CLOCK_sources above */
+	int	tx_clock_source;	/* dito */
+	int	trxc_pin_mode;		/* see TRXCP_modes above */
+	int	nrz_mode;		/* 0 = NRZ, 1 = NRZI */
+	int	tx_delay;		/* tx delay in msec */
+	int	tx_tail;		/* tx tail time in msec */
+	int	fullduplex;		/* Duplex mode: 0 = "halfduplex", 1 = "fullduplex" */
+	int	trx_feedback;		/* TRX feeds transmit signal back to RxD */
+	int	tx_inhibit;		/* Transmit is not allowed when set */
+	int	softdcd;		/* Use DPLL instead of DCD pin for carrier detect */
 };
 
 #ifdef __KERNEL__
@@ -182,71 +112,53 @@ enum {TX_OFF, TX_ON};	/* command for scc_key_trx() */
 #define RXINT		0x04
 #define SPINT		0x06
 
-#ifdef CONFIG_SCC_DELAY
-#define Inb(port)	inb_p(port)
-#define Outb(port, val)	outb_p(val, port)
-#else
-#define Inb(port)	inb(port)
-#define Outb(port, val)	outb(val, port)
-#endif
-
-/* SCC channel control structure for KISS */
-
-struct scc_kiss {
-	unsigned char txdelay;		/* Transmit Delay 10 ms/cnt */
-	unsigned char persist;		/* Persistence (0-255) as a % */
-	unsigned char slottime;		/* Delay to wait on persistence hit */
-	unsigned char tailtime;		/* Delay after last byte written */
-	unsigned char fulldup;		/* Full Duplex mode 0=CSMA 1=DUP 2=ALWAYS KEYED */
-	unsigned char waittime;		/* Waittime before any transmit attempt */
-	unsigned int  maxkeyup;		/* Maximum time to transmit (seconds) */
-	unsigned char mintime;		/* Minimal offtime after MAXKEYUP timeout (seconds) */
-	unsigned int  idletime;		/* Maximum idle time in ALWAYS KEYED mode (seconds) */
-	unsigned int  maxdefer;		/* Timer for CSMA channel busy limit */
-	unsigned char tx_inhibit;	/* Transmit is not allowed when set */	
-	unsigned char group;		/* Group ID for AX.25 TX interlocking */
-	unsigned char mode;		/* 'normal' or 'hwctrl' mode (unused) */
-	unsigned char softdcd;		/* Use DPLL instead of DCD pin for carrier detect */
-};
-
-
 /* SCC channel structure */
 
 struct scc_channel {
-	int magic;			/* magic word */
-
 	int init;			/* channel exists? */
 
 	struct net_device *dev;		/* link to device control structure */
 	struct net_device_stats dev_stat;/* device statistics */
+	struct ax25_dev ax25dev;
+	char * proc_dev_name;		/* points to dev->name or NULL */
 
 	char brand;			/* manufacturer of the board */
 	long clock;			/* used clock */
 
 	io_port ctrl;			/* I/O address of CONTROL register */
 	io_port	data;			/* I/O address of DATA register */
-	io_port special;		/* I/O address of special function port */
+	io_port special_port;		/* I/O address of special function port */
 	int irq;			/* Number of Interrupt */
 
-	char option;
+	char special_option;
 	char enhanced;			/* Enhanced SCC support */
 
 	unsigned char wreg[16]; 	/* Copy of last written value in WRx */
 	unsigned char status;		/* Copy of R0 at last external interrupt */
 	unsigned char dcd;		/* DCD status */
 
-        struct scc_kiss kiss;		/* control structure for KISS params */
-        struct scc_stat stat;		/* statistical information */
         struct scc_modem modem; 	/* modem information */
+        struct scc_stat  stat;		/* statistical information */
+
+        struct {
+		spinlock_t hwaccess;	/* hardware access */
+		spinlock_t timer;	/* timer functions */
+		spinlock_t kick_tx;	/* start of transmission */
+        } spinlocks;
+
+        struct {
+		ctl_table  channel[6];	/* /.../chip_<n>/channel_<k>/ */
+		ctl_table  modem[13];	/* /.../channel_<k>/modem/ */
+		ctl_table  stats[1];	/* /.../channel_<k>/stats/ */
+        } proc_tables;
+
 
-        struct sk_buff_head tx_queue;	/* next tx buffer */
         struct sk_buff *rx_buff;	/* pointer to frame currently received */
         struct sk_buff *tx_buff;	/* pointer to frame currently transmitted */
-
-	/* Timer */
-	struct timer_list tx_t;		/* tx timer for this channel */
-	struct timer_list tx_wdog;	/* tx watchdogs */
+        struct sk_buff *tx_new;		/* next transmit buffer */
+        struct timer_list tx_timer;	/* Tx delay & tail timer */
 };
 
+int scc_init(void);
 #endif /* defined(__KERNEL__) */
 #endif /* defined(_SCC_H) */
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index cbfaafbfe..24ca11425 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -155,7 +155,8 @@ enum
 	NET_TR=14,
 	NET_DECNET=15,
 	NET_ECONET=16,
-	NET_KHTTPD=17
+	NET_KHTTPD=17,
+	NET_DEV=18
 };
 
 /* /proc/sys/kernel/random */
@@ -423,7 +424,16 @@ enum {
 	NET_AX25_N2=11,
 	NET_AX25_PACLEN=12,
 	NET_AX25_PROTOCOL=13,
-	NET_AX25_DAMA_SLAVE_TIMEOUT=14
+	NET_AX25_DAMA_SLAVE_TIMEOUT=14,
+	NET_AX25_MEDIA_DUPLEX=15,
+	NET_AX25_MEDIA_TXDELAY=16,
+	NET_AX25_MEDIA_TXTAIL=17,
+	NET_AX25_MEDIA_TXBITRATE=18,
+	NET_AX25_MEDIA_RXBITRATE=19,
+	NET_AX25_MEDIA_SLOTTIME=20,
+	NET_AX25_MEDIA_PPERSISTENCE=21,
+	NET_AX25_MEDIA_AUTO_ADJUST=22,
+	NET_AX25_DEVICE_NAME=23
 };
 
 /* /proc/sys/net/rose */
@@ -510,6 +520,80 @@ enum {
 	NET_DECNET_CONF_DEV_STATE = 7
 };
 
+/* /proc/sys/net/dev/ (hardware configuration for net devices) */
+
+enum {
+	NET_DEV_Z8530DRV=1
+};
+
+/* /proc/sys/net/dev/z8530drv/ */
+
+enum {
+	NET_DEV_Z8530DRV_NCHIPS=1,
+	NET_DEV_Z8530DRV_DELAY=2,
+	NET_DEV_Z8530DRV_CHIP_BASE=32
+};
+
+/* /proc/sys/net/dev/z8530drv/chip<n>/ */
+
+enum {
+	NET_DEV_Z8530DRV_VENDOR=1,
+	NET_DEV_Z8530DRV_CLOCK=2,
+	NET_DEV_Z8530DRV_IRQ=3,
+	NET_DEV_Z8530DRV_ESCC=4,
+	NET_DEV_Z8530DRV_SPECIAL_PORT=5,
+	NET_DEV_Z8530DRV_SPECIAL_OPT=6,
+	NET_DEV_Z8530DRV_CHANNEL_A=32,
+	NET_DEV_Z8530DRV_CHANNEL_B=33
+};
+
+/* /proc/sys/net/dev/z8530drv/chip<n>/port<c>/ */
+
+enum {
+	NET_DEV_Z8530DRV_DATA_PORT=1,
+	NET_DEV_Z8530DRV_CTRL_PORT=2,
+	NET_DEV_Z8530DRV_IFNAME=3,
+	NET_DEV_Z8530DRV_BUFSIZE=4,
+/*
+	NET_DEV_Z8530DRV_SPECIAL_PORT=5,
+	NET_DEV_Z8530DRV_SPECIAL_OPT=6,
+*/
+	NET_DEV_Z8530DRV_MODEM=32,
+	NET_DEV_Z8530DRV_STAT=33
+};
+
+/* /proc/sys/net/dev/z8530drv/chip<n>/port<c>/modem/ */
+
+enum {
+	NET_DEV_Z8530DRV_RX_SPEED=1,
+	NET_DEV_Z8530DRV_TX_SPEED=2,
+	NET_DEV_Z8530DRV_RX_CLOCK_SOURCE=3,
+	NET_DEV_Z8530DRV_TX_CLOCK_SOURCE=4,
+	NET_DEV_Z8530DRV_TRXC_PIN_MODE=5,
+	NET_DEV_Z8530DRV_FULLDUPLEX=6,
+	NET_DEV_Z8530DRV_TRX_FEEDBACK=7,
+	NET_DEV_Z8530DRV_NRZ_MODE=8,
+	NET_DEV_Z8530DRV_TX_INHIBIT=9,
+	NET_DEV_Z8530DRV_SOFTDCD=10,
+	NET_DEV_Z8530DRV_TX_DELAY=11,
+	NET_DEV_Z8530DRV_TX_TAIL=12
+};
+
+/* /proc/sys/net/dev/z8530drv/chip<n>/port<c>/stats/ */
+
+enum {
+	NET_DEV_Z8530DRV_STAT_RX_INTS=1,
+	NET_DEV_Z8530DRV_STAT_TX_INTS=2,
+	NET_DEV_Z8530DRV_STAT_EX_INTS=3,
+	NET_DEV_Z8530DRV_STAT_TX_FRAMES=4,
+	NET_DEV_Z8530DRV_STAT_RX_FRAMES=5,
+	NET_DEV_Z8530DRV_STAT_TX_ERRORS=6,
+	NET_DEV_Z8530DRV_STAT_RX_ERRORS=7,
+	NET_DEV_Z8530DRV_STAT_TX_UNDERRUNS=8,
+	NET_DEV_Z8530DRV_STAT_RX_OVERRUNS=9,
+	NET_DEV_Z8530DRV_STAT_NO_SPACE=10,
+	NET_DEV_Z8530DRV_STAT_TX_STATE=11
+};
 /* CTL_PROC names: */
 
 /* CTL_FS names: */