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

[NET] AX.25 Kconfig and docs updates and fixes

o The AX.25 Howto is unmaintained since several years. I've replaced it
with a wiki at http://www.linux-ax25.org which provides more uptodate
information.
o Change default for AX25_DAMA_SLAVE to Y. AX25_DAMA_SLAVE only compiles
in support for DAMA but doesn't activate it. I hope this gets Linux
distributions to ship their AX.25 kernels with AX25_DAMA_SLAVE enabled.
The price for this would be very small.
o Delete historic changelog from comments, that's what SCM systems are
meant to do.
o ---help--- in Kconfig looks so yellingly eye insulting. Use just help.
o Rewrite the commented out piece of old Linux 2.4 configuration language
to Kconfig for consistency.
o Fixup dependencies.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Ralf Baechle and committed by
David S. Miller
954b2e7f ecbb4169

+42 -37
+6 -12
Documentation/networking/ax25.txt
··· 1 1 To use the amateur radio protocols within Linux you will need to get a 2 - suitable copy of the AX.25 Utilities. More detailed information about these 3 - and associated programs can be found on http://zone.pspt.fi/~jsn/. 4 - 5 - For more information about the AX.25, NET/ROM and ROSE protocol stacks, see 6 - the AX25-HOWTO written by Terry Dawson <terry@perf.no.itg.telstra.com.au> 7 - who is also the AX.25 Utilities maintainer. 2 + suitable copy of the AX.25 Utilities. More detailed information about 3 + AX.25, NET/ROM and ROSE, associated programs and and utilities can be 4 + found on http://www.linux-ax25.org. 8 5 9 6 There is an active mailing list for discussing Linux amateur radio matters 10 - called linux-hams. To subscribe to it, send a message to 7 + called linux-hams@vger.kernel.org. To subscribe to it, send a message to 11 8 majordomo@vger.kernel.org with the words "subscribe linux-hams" in the body 12 - of the message, the subject field is ignored. 13 - 14 - Jonathan G4KLX 15 - 16 - g4klx@g4klx.demon.co.uk 9 + of the message, the subject field is ignored. You don't need to be 10 + subscribed to post but of course that means you might miss an answer.
+36 -25
net/ax25/Kconfig
··· 1 1 # 2 2 # Amateur Radio protocols and AX.25 device configuration 3 3 # 4 - # 19971130 Now in an own category to make correct compilation of the 5 - # AX.25 stuff easier... 6 - # Joerg Reuter DL1BKE <jreuter@yaina.de> 7 - # 19980129 Moved to net/ax25/Config.in, sourcing device drivers. 8 4 9 5 menuconfig HAMRADIO 10 6 depends on NET 11 7 bool "Amateur Radio support" 12 8 help 13 9 If you want to connect your Linux box to an amateur radio, answer Y 14 - here. You want to read <http://www.tapr.org/tapr/html/pkthome.html> and 15 - the AX25-HOWTO, available from <http://www.tldp.org/docs.html#howto>. 10 + here. You want to read <http://www.tapr.org/tapr/html/pkthome.html> 11 + and more specifically about AX.25 on Linux 12 + <http://www.linux-ax25.org/>. 16 13 17 14 Note that the answer to this question won't directly affect the 18 15 kernel: saying N will just cause the configurator to skip all 19 16 the questions about amateur radio. 20 17 21 18 comment "Packet Radio protocols" 22 - depends on HAMRADIO && NET 19 + depends on HAMRADIO 23 20 24 21 config AX25 25 22 tristate "Amateur Radio AX.25 Level 2 protocol" 26 - depends on HAMRADIO && NET 27 - ---help--- 23 + depends on HAMRADIO 24 + help 28 25 This is the protocol used for computer communication over amateur 29 26 radio. It is either used by itself for point-to-point links, or to 30 27 carry other protocols such as tcp/ip. To use it, you need a device ··· 49 52 50 53 config AX25_DAMA_SLAVE 51 54 bool "AX.25 DAMA Slave support" 55 + default y 52 56 depends on AX25 53 57 help 54 58 DAMA is a mechanism to prevent collisions when doing AX.25 ··· 57 59 from clients (called "slaves") and redistributes it to other slaves. 58 60 If you say Y here, your Linux box will act as a DAMA slave; this is 59 61 transparent in that you don't have to do any special DAMA 60 - configuration. (Linux cannot yet act as a DAMA server.) If unsure, 61 - say N. 62 + configuration. Linux cannot yet act as a DAMA server. This option 63 + only compiles DAMA slave support into the kernel. It still needs to 64 + be enabled at runtime. For more about DAMA see 65 + <http://www.linux-ax25.org>. If unsure, say Y. 62 66 63 - # bool ' AX.25 DAMA Master support' CONFIG_AX25_DAMA_MASTER 67 + # placeholder until implemented 68 + config AX25_DAMA_MASTER 69 + bool 'AX.25 DAMA Master support' 70 + depends on AX25_DAMA_SLAVE && BROKEN 71 + help 72 + DAMA is a mechanism to prevent collisions when doing AX.25 73 + networking. A DAMA server (called "master") accepts incoming traffic 74 + from clients (called "slaves") and redistributes it to other slaves. 75 + If you say Y here, your Linux box will act as a DAMA master; this is 76 + transparent in that you don't have to do any special DAMA 77 + configuration. Linux cannot yet act as a DAMA server. This option 78 + only compiles DAMA slave support into the kernel. It still needs to 79 + be explicitly enabled, so if unsure, say Y. 80 + 64 81 config NETROM 65 82 tristate "Amateur Radio NET/ROM protocol" 66 83 depends on AX25 67 - ---help--- 84 + help 68 85 NET/ROM is a network layer protocol on top of AX.25 useful for 69 86 routing. 70 87 71 88 A comprehensive listing of all the software for Linux amateur radio 72 89 users as well as information about how to configure an AX.25 port is 73 - contained in the AX25-HOWTO, available from 74 - <http://www.tldp.org/docs.html#howto>. You also might want to 75 - check out the file <file:Documentation/networking/ax25.txt>. More 76 - information about digital amateur radio in general is on the WWW at 90 + contained in the Linux Ham Wiki, available from 91 + <http://www.linux-ax25.org>. You also might want to check out the 92 + file <file:Documentation/networking/ax25.txt>. More information about 93 + digital amateur radio in general is on the WWW at 77 94 <http://www.tapr.org/tapr/html/pkthome.html>. 78 95 79 96 To compile this driver as a module, choose M here: the ··· 97 84 config ROSE 98 85 tristate "Amateur Radio X.25 PLP (Rose)" 99 86 depends on AX25 100 - ---help--- 87 + help 101 88 The Packet Layer Protocol (PLP) is a way to route packets over X.25 102 89 connections in general and amateur radio AX.25 connections in 103 90 particular, essentially an alternative to NET/ROM. 104 91 105 92 A comprehensive listing of all the software for Linux amateur radio 106 93 users as well as information about how to configure an AX.25 port is 107 - contained in the AX25-HOWTO, available from 108 - <http://www.tldp.org/docs.html#howto>. You also might want to 109 - check out the file <file:Documentation/networking/ax25.txt>. More 110 - information about digital amateur radio in general is on the WWW at 94 + contained in the Linux Ham Wiki, available from 95 + <http://www.linux-ax25.org>. You also might want to check out the 96 + file <file:Documentation/networking/ax25.txt>. More information about 97 + digital amateur radio in general is on the WWW at 111 98 <http://www.tapr.org/tapr/html/pkthome.html>. 112 99 113 100 To compile this driver as a module, choose M here: the 114 101 module will be called rose. 115 102 116 - 117 103 menu "AX.25 network device drivers" 118 - depends on HAMRADIO && NET && AX25!=n 104 + depends on HAMRADIO && AX25 119 105 120 106 source "drivers/net/hamradio/Kconfig" 121 107 122 108 endmenu 123 -