From e5067d7cd967cb17067de24a162306b79f432b20 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 24 Jun 2015 04:23:46 +0200
Subject: Import newax25-2.4.3.patch.1.bz2

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>
---
 include/linux/sysctl.h | 88 ++++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 86 insertions(+), 2 deletions(-)

(limited to 'include/linux/sysctl.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: */
-- 
cgit v1.2.3