summaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-09-26 15:29:31 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-09-26 15:29:31 -0700
commit56e9b263242ca80a70abd8831343b268315c27dc (patch)
tree19a4fe82be6725754a1b0a25638e693d994ac86d /include/linux
parent188bab3ae0ed164bc18f98be932512d777dd038b (diff)
parent8420e1b541fe92aee1d8d4d25d9e33eaca756a7b (diff)
downloadop-kernel-dev-56e9b263242ca80a70abd8831343b268315c27dc.zip
op-kernel-dev-56e9b263242ca80a70abd8831343b268315c27dc.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/llc-2.6
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/sysctl.h26
1 files changed, 25 insertions, 1 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h
index 3a29a9f..fc8e367 100644
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@ -202,7 +202,8 @@ enum
NET_TR=14,
NET_DECNET=15,
NET_ECONET=16,
- NET_SCTP=17,
+ NET_SCTP=17,
+ NET_LLC=18,
};
/* /proc/sys/kernel/random */
@@ -522,6 +523,29 @@ enum {
NET_IPX_FORWARDING=2
};
+/* /proc/sys/net/llc */
+enum {
+ NET_LLC2=1,
+ NET_LLC_STATION=2,
+};
+
+/* /proc/sys/net/llc/llc2 */
+enum {
+ NET_LLC2_TIMEOUT=1,
+};
+
+/* /proc/sys/net/llc/station */
+enum {
+ NET_LLC_STATION_ACK_TIMEOUT=1,
+};
+
+/* /proc/sys/net/llc/llc2/timeout */
+enum {
+ NET_LLC2_ACK_TIMEOUT=1,
+ NET_LLC2_P_TIMEOUT=2,
+ NET_LLC2_REJ_TIMEOUT=3,
+ NET_LLC2_BUSY_TIMEOUT=4,
+};
/* /proc/sys/net/appletalk */
enum {
OpenPOWER on IntegriCloud