drop support for IPX
Subsystems (4)
PATCH 1/1 drop support for IPX
IPX has been depracted then removed from upstream kernels. Drop support from ip route as well.
Signed-off-by Stephen Hemminger <[email protected]>
--- Makefile | 3 -- include/utils.h | 10 ----- ip/ip.c | 4 +- ip/iproute.c | 2 +- lib/ipx_ntop.c | 71 ------------------------------- lib/ipx_pton.c | 97 ------------------------------------------ lib/utils.c | 2 - man/man8/ip-route.8.in | 2 +- man/man8/ip.8 | 9 +--- 9 files changed, 5 insertions(+), 195 deletions(-) delete mode 100644 lib/ipx_ntop.c delete mode 100644 lib/ipx_pton.c
Makefile +0 -3
@@ -43,9 +43,6 @@ DEFINES+=-DCONFDIR=\"$(CONFDIR)\" \ #options for decnet ADDLIB+=dnet_ntop.o dnet_pton.o -#options for ipx -ADDLIB+=ipx_ntop.o ipx_pton.o - #options for mpls ADDLIB+=mpls_ntop.o mpls_pton.o
include/utils.h +0 -10
@@ -116,13 +116,6 @@ struct dn_naddrunsigned char a_addr[DN_MAXADDL ]; }; -#define IPX_NODE_LEN 6 - -struct ipx_addr { -u_int32_t ipx_net; -u_int8_t ipx_node[IPX_NODE_LEN ]; -}; -#ifndef AF_MPLS # define AF_MPLS 28#endif
@@ -207,9 +200,6 @@ int inet_addr_match_rta(const inet_prefix *m, const struct rtattr *rta);const char *dnet_ntop (int af,const void *addr,char *str,size_t len);int dnet_pton (int af,const char *src,void *addr); -const char *ipx_ntop (int af,const void *addr,char *str,size_t len); -int ipx_pton (int af,const char *src,void *addr); -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);
ip/ip.c +1 -3
@@ -53,7 +53,7 @@ static void usage(void)" vrf | sr }\n" " OPTIONS := { -V[ersion] | -s[tatistics] | -d[etails] | -r[esolve] |\n" " -h[uman-readable] | -iec | -j[son] | -p[retty] |\n" -" -f[amily] { inet | inet6 | ipx | dnet | mpls | bridge | link } |\n" +" -f[amily] { inet | inet6 | dnet | mpls | bridge | link } |\n" " -4 | -6 | -I | -D | -M | -B | -0 |\n" " -l[oops] { maximum-addr-flush-attempts } | -br[ief] |\n" " -o[neline] | -t[imestamp] | -ts[hort] | -b[atch] [filename] |\n"
@@ -225,8 +225,6 @@ int main(int argc, char **argv) preferred_family =AF_INET6 ; }else if (strcmp (opt,"-0" ) ==0 ) { preferred_family =AF_PACKET ; - }else if (strcmp (opt,"-I" ) ==0 ) { - preferred_family =AF_IPX ; }else if (strcmp (opt,"-D" ) ==0 ) { preferred_family = AF_DECnet; }else if (strcmp (opt,"-M" ) ==0 ) {
ip/iproute.c +1 -1
@@ -83,7 +83,7 @@ static void usage(void)"INFO_SPEC := NH OPTIONS FLAGS [ nexthop NH ]...\n" "NH := [ encap ENCAPTYPE ENCAPHDR ] [ via [ FAMILY ] ADDRESS ]\n" " [ dev STRING ] [ weight NUMBER ] NHFLAGS\n" -"FAMILY := [ inet | inet6 | ipx | dnet | mpls | bridge | link ]\n" +"FAMILY := [ inet | inet6 | dnet | mpls | bridge | link ]\n" "OPTIONS := FLAGS [ mtu NUMBER ] [ advmss NUMBER ] [ as [ to ] ADDRESS ]\n" " [ rtt TIME ] [ rttvar TIME ] [ reordering NUMBER ]\n" " [ window NUMBER ] [ cwnd NUMBER ] [ initcwnd NUMBER ]\n"
lib/ipx_ntop.c deleted +0 -71
71 lines not on this page · raw message
lib/ipx_pton.c deleted +0 -97
97 lines not on this page · raw message
lib/utils.c +0 -2
@@ -1033,8 +1033,6 @@ const char *rt_addr_n2a_r(int af, int len,return inet_ntop (af, addr, buf, buflen);case AF_MPLS :return mpls_ntop (af, addr, buf, buflen); -case AF_IPX : -return ipx_ntop (af, addr, buf, buflen);case AF_DECnet: {struct dn_naddr dna = {2 , {0 ,0 , } };
man/man8/ip-route.8.in +1 -1
@@ -107,7 +107,7 @@ replace " } " .ti -8 .IR FAMILY " := [ " -.BR inet " | " inet6 " | " ipx " | " dnet " | " mpls " | " bridge " | " link " ]" +.BR inet " | " inet6 " | " dnet " | " mpls " | " bridge " | " link " ]" .ti -8 .IR OPTIONS " := " FLAGS " [ "
man/man8/ip.8 +2 -7
@@ -34,7 +34,7 @@ ip \- show / manipulate routing, network devices, interfaces and tunnels \fB\-r\fR[\fIesolve\fR] | \fB\-iec\fR | \fB\-f\fR[\fIamily\fR] { -.BR inet " | " inet6 " | " ipx " | " dnet " | " link " } | " +.BR inet " | " inet6 " | " dnet " | " link " } | " \fB-4\fR | \fB-6\fR | \fB-I\fR |
@@ -94,7 +94,7 @@ Zero (0) means loop until all addresses are removed. .TP .BR "\-f" , " \-family " <FAMILY> Specifies the protocol family to use. The protocol family identifier can be one of -.BR "inet" , " inet6" , " bridge" , " ipx" , " dnet" , " mpls" +.BR "inet" , " inet6" , " bridge" , " dnet" , " mpls" or .BR link . If this option is not present,
@@ -130,11 +130,6 @@ shortcut for shortcut for .BR "\-family decnet" . -.TP -.B \-I -shortcut for -.BR "\-family ipx" . - .TP .B \-M shortcut for
Signature · 1 line
2.17.1