From 6e66ee710990b8e444c9cac7f645bd5c677c8f1f Mon Sep 17 00:00:00 2001
From: Ralf Baechle DL5RB <ralf@linux-mips.org>
Date: Sun, 19 Mar 2006 13:20:06 -0800
Subject: [PATCH] --- yaml --- r: 21093 b: refs/heads/master c:
 c7c694d196a39af6e644e24279953d04f30362db h: refs/heads/master i:   21091:
 0af78579f776bd4c3865cc8208a125e1940e65b8 v: v3

---
 [refs]                           | 2 +-
 trunk/include/net/ax25.h         | 9 ++++++++-
 trunk/net/ax25/sysctl_net_ax25.c | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 5ace33ce7969..93f030b33ac6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60a6dc55b93b3321afa52f650a149fb7e87fa85a
+refs/heads/master: c7c694d196a39af6e644e24279953d04f30362db
diff --git a/trunk/include/net/ax25.h b/trunk/include/net/ax25.h
index 2250a18b0cbb..d052b221dbcd 100644
--- a/trunk/include/net/ax25.h
+++ b/trunk/include/net/ax25.h
@@ -110,8 +110,15 @@ enum {
 enum {
 	AX25_PROTO_STD_SIMPLEX,
 	AX25_PROTO_STD_DUPLEX,
+#ifdef CONFIG_AX25_DAMA_SLAVE
 	AX25_PROTO_DAMA_SLAVE,
-	AX25_PROTO_DAMA_MASTER
+#ifdef CONFIG_AX25_DAMA_MASTER
+	AX25_PROTO_DAMA_MASTER,
+#define AX25_PROTO_MAX AX25_PROTO_DAMA_MASTER
+#endif
+#endif
+	__AX25_PROTO_MAX,
+	AX25_PROTO_MAX = __AX25_PROTO_MAX -1
 };
 
 enum {
diff --git a/trunk/net/ax25/sysctl_net_ax25.c b/trunk/net/ax25/sysctl_net_ax25.c
index f67711f2ee96..894a22558d9d 100644
--- a/trunk/net/ax25/sysctl_net_ax25.c
+++ b/trunk/net/ax25/sysctl_net_ax25.c
@@ -24,7 +24,7 @@ static int min_t3[1],   		max_t3[] = {3600 * HZ};
 static int min_idle[1],  		max_idle[] = {65535 * HZ};
 static int min_n2[] = {1},		max_n2[] = {31};
 static int min_paclen[] = {1},		max_paclen[] = {512};
-static int min_proto[1],		max_proto[] = {3};
+static int min_proto[1],		max_proto[] = { AX25_PROTO_MAX };
 static int min_ds_timeout[1],   	max_ds_timeout[] = {65535 * HZ};
 
 static struct ctl_table_header *ax25_table_header;