net: ax25: remove plumbing for never-implemented DAMA Master support

The AX25_DAMA_MASTER option has been unimplemented and marked broken
ever since it was introduced in 2007 in commit 954b2e7f4c37 ("[NET]
AX.25 Kconfig and docs updates and fixes"). At this point, it is very
unlikely it will be implemented. Remove it.

Signed-off-by: Ethan Nelson-Moore <enelsonmoore@gmail.com>
Link: https://patch.msgid.link/20260129080908.44710-1-enelsonmoore@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/include/net/ax25.h b/include/net/ax25.h
index a7bba42dde153a2aeaf010a7ef8b48d39d15a835..ad3d7626130e037a12f4123211c8f045f684a0ff 100644 (file)
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
@@ -116,10 +116,6 @@ enum {
        AX25_PROTO_STD_DUPLEX,
 #ifdef CONFIG_AX25_DAMA_SLAVE
        AX25_PROTO_DAMA_SLAVE,
-#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
@@ -138,7 +134,7 @@ enum {
        AX25_VALUES_IDLE,       /* Connected mode idle timer */
        AX25_VALUES_N2,         /* Default N2 value */
        AX25_VALUES_PACLEN,     /* AX.25 MTU */
-       AX25_VALUES_PROTOCOL,   /* Std AX.25, DAMA Slave, DAMA Master */
+       AX25_VALUES_PROTOCOL,   /* Std AX.25, DAMA Slave */
 #ifdef CONFIG_AX25_DAMA_SLAVE
        AX25_VALUES_DS_TIMEOUT, /* DAMA Slave timeout */
 #endif
@@ -226,7 +222,7 @@ typedef struct ax25_dev {
        struct net_device       *forward;
        struct ctl_table_header *sysheader;
        int                     values[AX25_MAX_VALUES];
-#if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
+#ifdef CONFIG_AX25_DAMA_SLAVE
        ax25_dama_info          dama;
 #endif
        refcount_t              refcount;

diff --git a/net/ax25/Kconfig b/net/ax25/Kconfig
index e23a3dc14b9315aab9a9913d0d2bb4120bbec818..310169ce148811142a8b45d5ff0bd230d12a7559 100644 (file)
--- a/net/ax25/Kconfig
+++ b/net/ax25/Kconfig
@@ -63,20 +63,6 @@ config AX25_DAMA_SLAVE
          be enabled at runtime.  For more about DAMA see
          <https://linux-ax25.in-berlin.de>.  If unsure, say Y.
 
-# placeholder until implemented
-config AX25_DAMA_MASTER
-       bool 'AX.25 DAMA Master support'
-       depends on AX25_DAMA_SLAVE && BROKEN
-       help
-         DAMA is a mechanism to prevent collisions when doing AX.25
-         networking. A DAMA server (called "master") accepts incoming traffic
-         from clients (called "slaves") and redistributes it to other slaves.
-         If you say Y here, your Linux box will act as a DAMA master; this is
-         transparent in that you don't have to do any special DAMA
-         configuration. Linux cannot yet act as a DAMA server.  This option
-         only compiles DAMA slave support into the kernel.  It still needs to
-         be explicitly enabled, so if unsure, say Y.
-
 config NETROM
        tristate "Amateur Radio NET/ROM protocol"
        depends on AX25

diff --git a/net/ax25/ax25_dev.c b/net/ax25/ax25_dev.c
index 3733c0254a50842fed496bfd983d9d5633ea8ea4..c504ed9c3a88ddccaf362c570bd652ed155a2add 100644 (file)
--- a/net/ax25/ax25_dev.c
+++ b/net/ax25/ax25_dev.c
@@ -82,9 +82,7 @@ void ax25_dev_device_up(struct net_device *dev)
 
 #ifdef CONFIG_AX25_DAMA_SLAVE
        ax25_dev->values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT;
-#endif
 
-#if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
        ax25_ds_setup_timer(ax25_dev);
 #endif