tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Ethan Nelson-Moore and committed by
Jakub Kicinski 82fff3b0 eec90ea4

+2 -22
+2 -6
include/net/ax25.h
··· 116 116 AX25_PROTO_STD_DUPLEX, 117 117 #ifdef CONFIG_AX25_DAMA_SLAVE 118 118 AX25_PROTO_DAMA_SLAVE, 119 - #ifdef CONFIG_AX25_DAMA_MASTER 120 - AX25_PROTO_DAMA_MASTER, 121 - #define AX25_PROTO_MAX AX25_PROTO_DAMA_MASTER 122 - #endif 123 119 #endif 124 120 __AX25_PROTO_MAX, 125 121 AX25_PROTO_MAX = __AX25_PROTO_MAX -1 ··· 134 138 AX25_VALUES_IDLE, /* Connected mode idle timer */ 135 139 AX25_VALUES_N2, /* Default N2 value */ 136 140 AX25_VALUES_PACLEN, /* AX.25 MTU */ 137 - AX25_VALUES_PROTOCOL, /* Std AX.25, DAMA Slave, DAMA Master */ 141 + AX25_VALUES_PROTOCOL, /* Std AX.25, DAMA Slave */ 138 142 #ifdef CONFIG_AX25_DAMA_SLAVE 139 143 AX25_VALUES_DS_TIMEOUT, /* DAMA Slave timeout */ 140 144 #endif ··· 222 226 struct net_device *forward; 223 227 struct ctl_table_header *sysheader; 224 228 int values[AX25_MAX_VALUES]; 225 - #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER) 229 + #ifdef CONFIG_AX25_DAMA_SLAVE 226 230 ax25_dama_info dama; 227 231 #endif 228 232 refcount_t refcount;
-14
net/ax25/Kconfig
··· 63 63 be enabled at runtime. For more about DAMA see 64 64 <https://linux-ax25.in-berlin.de>. If unsure, say Y. 65 65 66 - # placeholder until implemented 67 - config AX25_DAMA_MASTER 68 - bool 'AX.25 DAMA Master support' 69 - depends on AX25_DAMA_SLAVE && BROKEN 70 - help 71 - DAMA is a mechanism to prevent collisions when doing AX.25 72 - networking. A DAMA server (called "master") accepts incoming traffic 73 - from clients (called "slaves") and redistributes it to other slaves. 74 - If you say Y here, your Linux box will act as a DAMA master; this is 75 - transparent in that you don't have to do any special DAMA 76 - configuration. Linux cannot yet act as a DAMA server. This option 77 - only compiles DAMA slave support into the kernel. It still needs to 78 - be explicitly enabled, so if unsure, say Y. 79 - 80 66 config NETROM 81 67 tristate "Amateur Radio NET/ROM protocol" 82 68 depends on AX25
-2
net/ax25/ax25_dev.c
··· 82 82 83 83 #ifdef CONFIG_AX25_DAMA_SLAVE 84 84 ax25_dev->values[AX25_VALUES_DS_TIMEOUT]= AX25_DEF_DS_TIMEOUT; 85 - #endif 86 85 87 - #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER) 88 86 ax25_ds_setup_timer(ax25_dev); 89 87 #endif 90 88