Skip to contentSkip to conversation

remove hamradio protocols

PATCH Applied Stephen Hemminger 2 participants 2 messages Apr 24 – Apr 27

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 remove hamradio protocols

The ax25, rose, and netrom have been removed upstream. Drop support for those protocols from iproute2.

---
 Makefile                  |   9 ---
 include/uapi/linux/ax25.h | 117 --------------------------------------
 include/uapi/linux/rose.h |  91 -----------------------------
 include/utils.h           |   6 --
 lib/ax25_ntop.c           |  82 --------------------------
 lib/ll_addr.c             |   6 --
 lib/netrom_ntop.c         |  23 --------
 lib/rose_ntop.c           |  56 ------------------
 8 files changed, 390 deletions(-)
 delete mode 100644 include/uapi/linux/ax25.h
 delete mode 100644 include/uapi/linux/rose.h
 delete mode 100644 lib/ax25_ntop.c
 delete mode 100644 lib/netrom_ntop.c
 delete mode 100644 lib/rose_ntop.c
Makefile +0 -9
index 1bebf08f..6f5d4765 100644
@@ -45,18 +45,9 @@ DEFINES+=-DCONF_USR_DIR=\"$(CONF_USR_DIR)\" \
          -DARPDDIR=\"$(ARPDDIR)\" \
          -DCONF_COLOR=$(CONF_COLOR)
 
-#options for AX.25
-ADDLIB+=ax25_ntop.o
-
-#options for AX.25
-ADDLIB+=rose_ntop.o
-
 #options for mpls
 ADDLIB+=mpls_ntop.o mpls_pton.o
 
-#options for NETROM
-ADDLIB+=netrom_ntop.o
-
 CC := gcc
 HOSTCC ?= $(CC)
 DEFINES += -D_GNU_SOURCE
include/uapi/linux/ax25.h deleted +0 -117

117 lines not on this page · raw message

include/uapi/linux/rose.h deleted +0 -91

91 lines not on this page · raw message

include/utils.h +0 -6
index b68d6bc4..e4e318e2 100644
@@ -199,15 +199,9 @@ int matches(const char *prefix, const char *string);
 int inet_addr_match(const inet_prefix *a, const inet_prefix *b, int bits);
 int inet_addr_match_rta(const inet_prefix *m, const struct rtattr *rta);
 
-const char *ax25_ntop(int af, const void *addr, char *str, socklen_t len);
-
-const char *rose_ntop(int af, const void *addr, char *buf, socklen_t buflen);
-
 const char *mpls_ntop(int af, const void *addr, char *str, size_t len);
 int mpls_pton(int af, const char *src, void *addr, size_t alen);
 
-const char *netrom_ntop(int af, const void *addr, char *str, socklen_t len);
-
 extern int __iproute2_hz_internal;
 int __get_hz(void);
 
lib/ax25_ntop.c deleted +0 -82

82 lines not on this page · raw message

lib/ll_addr.c +0 -6
index 5e924591..7a9eb3a4 100644
@@ -35,12 +35,6 @@ const char *ll_addr_n2a(const unsigned char *addr, int alen, int type,
 
 	if (alen == 16 && (type == ARPHRD_TUNNEL6 || type == ARPHRD_IP6GRE))
 		return inet_ntop(AF_INET6, addr, buf, blen);
-	if (alen == 7 && type == ARPHRD_AX25)
-		return ax25_ntop(AF_AX25, addr, buf, blen);
-	if (alen == 7 && type == ARPHRD_NETROM)
-		return netrom_ntop(AF_NETROM, addr, buf, blen);
-	if (alen == 5 && type == ARPHRD_ROSE)
-		return rose_ntop(AF_ROSE, addr, buf, blen);
 
 	snprintf(buf, blen, "%02x", addr[0]);
 	for (i = 1, l = 2; i < alen && l < blen; i++, l += 3)
lib/netrom_ntop.c deleted +0 -23
deleted file mode 100644
index 3dd6cb0b..00000000
@@ -1,23 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-
-#include <sys/socket.h>
-#include <errno.h>
-#include <linux/ax25.h>
-
-#include "utils.h"
-
-const char *ax25_ntop1(const ax25_address *src, char *dst, socklen_t size);
-
-const char *netrom_ntop(int af, const void *addr, char *buf, socklen_t buflen)
-{
-	switch (af) {
-	case AF_NETROM:
-		errno = 0;
-		return ax25_ntop1((ax25_address *)addr, buf, buflen);
-
-	default:
-		errno = EAFNOSUPPORT;
-	}
-
-	return NULL;
-}
lib/rose_ntop.c deleted +0 -56

56 lines not on this page · raw message

Signature · 1 line
2.53.0
#1 lore raw
This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:

Hello:

This patch was applied to iproute2/iproute2.git (main) by Stephen Hemminger <[email protected]>:

Quoted 4 lines · On Fri, 24 Apr 2026 16:24:27 -0700 you wrote:

The ax25, rose, and netrom have been removed upstream. Drop support for those protocols from iproute2.

Quoted 15 lines
---
 Makefile                  |   9 ---
 include/uapi/linux/ax25.h | 117 --------------------------------------
 include/uapi/linux/rose.h |  91 -----------------------------
 include/utils.h           |   6 --
 lib/ax25_ntop.c           |  82 --------------------------
 lib/ll_addr.c             |   6 --
 lib/netrom_ntop.c         |  23 --------
 lib/rose_ntop.c           |  56 ------------------
 8 files changed, 390 deletions(-)
 delete mode 100644 include/uapi/linux/ax25.h
 delete mode 100644 include/uapi/linux/rose.h
 delete mode 100644 lib/ax25_ntop.c
 delete mode 100644 lib/netrom_ntop.c
 delete mode 100644 lib/rose_ntop.c

Here is the summary with links:
- [iproute2] remove hamradio protocols

    https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/commit/?id=f46186fd0332

You are awesome, thank you!

Signature · 2 lines
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html