diff --git a/Makefile b/Makefile index cadda235..5b040415 100644 --- a/Makefile +++ b/Makefile @@ -63,7 +63,7 @@ LDLIBS += $(LIBNETLINK) all: config.mk @set -e; \ for i in $(SUBDIRS); \ - do echo; echo $$i; $(MAKE) $(MFLAGS) -C $$i; done + do echo; echo $$i; $(MAKE) -C $$i; done .PHONY: clean clobber distclean check cscope version @@ -101,11 +101,11 @@ version: clean: @for i in $(SUBDIRS) testsuite; \ - do $(MAKE) $(MFLAGS) -C $$i clean; done + do $(MAKE) -C $$i clean; done clobber: touch config.mk - $(MAKE) $(MFLAGS) clean + $(MAKE) clean rm -f config.mk cscope.* distclean: clobber diff --git a/ip/ipaddress.c b/ip/ipaddress.c index e69938b4..571346b1 100644 --- a/ip/ipaddress.c +++ b/ip/ipaddress.c @@ -1285,8 +1285,8 @@ static const struct ifa_flag_data_t { { .name = "tentative", .mask = IFA_F_TENTATIVE, .readonly = true, .v6only = true}, { .name = "permanent", .mask = IFA_F_PERMANENT, .readonly = true, .v6only = true}, { .name = "mngtmpaddr", .mask = IFA_F_MANAGETEMPADDR, .readonly = false, .v6only = true}, - { .name = "noprefixroute", .mask = IFA_F_NOPREFIXROUTE, .readonly = false, .v6only = true}, - { .name = "autojoin", .mask = IFA_F_MCAUTOJOIN, .readonly = false, .v6only = true}, + { .name = "noprefixroute", .mask = IFA_F_NOPREFIXROUTE, .readonly = false, .v6only = false}, + { .name = "autojoin", .mask = IFA_F_MCAUTOJOIN, .readonly = false, .v6only = false}, { .name = "stable-privacy", .mask = IFA_F_STABLE_PRIVACY, .readonly = true, .v6only = true}, }; diff --git a/ip/iplink_ipoib.c b/ip/iplink_ipoib.c index 05dba350..b730c533 100644 --- a/ip/iplink_ipoib.c +++ b/ip/iplink_ipoib.c @@ -99,7 +99,7 @@ static void ipoib_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) snprintf(b1, sizeof(b1), "%#.4x", pkey); print_string(PRINT_JSON, "key", NULL, b1); } else { - fprintf(f, "pkey %#.4x ", pkey); + fprintf(f, "pkey %#.4x ", pkey); } if (!tb[IFLA_IPOIB_MODE] || @@ -112,7 +112,7 @@ static void ipoib_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) mode == IPOIB_MODE_DATAGRAM ? "datagram" : mode == IPOIB_MODE_CONNECTED ? "connected" : "unknown"; - print_string(PRINT_ANY, "mode", "mode %s ", mode_str); + print_string(PRINT_ANY, "mode", "mode %s ", mode_str); if (!tb[IFLA_IPOIB_UMCAST] || RTA_PAYLOAD(tb[IFLA_IPOIB_UMCAST]) < sizeof(__u16)) @@ -126,7 +126,7 @@ static void ipoib_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[]) snprintf(b1, sizeof(b1), "%.4x", umcast); print_string(PRINT_JSON, "umcast", NULL, b1); } else { - fprintf(f, "umcast %.4x ", umcast); + fprintf(f, "umcast %.4x ", umcast); } } diff --git a/ip/ipntable.c b/ip/ipntable.c index ddee4905..b5b06a3b 100644 --- a/ip/ipntable.c +++ b/ip/ipntable.c @@ -517,6 +517,11 @@ static void print_ndtstats(const struct ndt_stats *ndts) print_u64(PRINT_ANY, "forced_gc_runs", "forced_gc_runs %llu ", ndts->ndts_forced_gc_runs); + print_string(PRINT_FP, NULL, "%s ", _SL_); + + print_u64(PRINT_ANY, "table_fulls", "table_fulls %llu ", + ndts->ndts_table_fulls); + print_nl(); } diff --git a/man/man8/ip-link.8.in b/man/man8/ip-link.8.in index 4acb5d47..1eb76655 100644 --- a/man/man8/ip-link.8.in +++ b/man/man8/ip-link.8.in @@ -1919,6 +1919,28 @@ change the .B MULTICAST flag on the device. +.TP +.BR "allmulticast on " or " allmulticast off" +change the +.B ALLMULTI +flag on the device. When enabled, instructs network driver to retrieve all +multicast packets from the network to the kernel for further processing. + +.TP +.BR "promisc on " or " promisc off" +change the +.B PROMISC +flag on the device. When enabled, activates promiscuous operation of the +network device. + +.TP +.BR "trailers on " or " trailers off" +change the +.B NOTRAILERS +flag on the device, +.B NOT +used by the Linux and exists for BSD compatibility. + .TP .BR "protodown on " or " protodown off" change the