Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package ethtool for openSUSE:Factory checked
in at 2021-05-12 19:31:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ethtool (Old)
and /work/SRC/openSUSE:Factory/.ethtool.new.2988 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ethtool"
Wed May 12 19:31:32 2021 rev:67 rq:891920 version:5.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/ethtool/ethtool.changes 2020-12-22
11:25:37.664730005 +0100
+++ /work/SRC/openSUSE:Factory/.ethtool.new.2988/ethtool.changes
2021-05-12 19:31:51.395127629 +0200
@@ -1,0 +2,9 @@
+Sun May 2 21:58:47 UTC 2021 - Michal Kubecek <mkube...@suse.cz>
+
+- update to new upstream release 5.12
+ * Feature: support lanes count (no option and -s)
+ * Fix: fix help message for master-slave parameter (-s)
+ * Fix: better error message for master-slave in ioctl code path
+ * Fix: get rid of compiler warnings in "make check"
+
+-------------------------------------------------------------------
Old:
----
ethtool-5.10.tar.sign
ethtool-5.10.tar.xz
New:
----
ethtool-5.12.tar.sign
ethtool-5.12.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ethtool.spec ++++++
--- /var/tmp/diff_new_pack.DuVqjh/_old 2021-05-12 19:31:51.963125360 +0200
+++ /var/tmp/diff_new_pack.DuVqjh/_new 2021-05-12 19:31:51.967125343 +0200
@@ -1,7 +1,7 @@
#
# spec file for package ethtool
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: ethtool
-Version: 5.10
+Version: 5.12
Release: 0
Summary: Utility for examining and tuning Ethernet-based network
interfaces
License: GPL-2.0-only
++++++ ethtool-5.10.tar.xz -> ethtool-5.12.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/NEWS new/ethtool-5.12/NEWS
--- old/ethtool-5.10/NEWS 2020-12-16 16:31:12.000000000 +0100
+++ new/ethtool-5.12/NEWS 2021-05-02 22:03:17.000000000 +0200
@@ -1,3 +1,9 @@
+Version 5.12 - May 2, 2021
+ * Feature: support lanes count (no option and -s)
+ * Fix: fix help message for master-slave parameter (-s)
+ * Fix: better error message for master-slave in ioctl code path
+ * Fix: get rid of compiler warnings in "make check"
+
Version 5.10 - Dec 16, 2020
* Feature: infrastructure for JSON output
* Feature: separate FLAGS in -h output
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/configure new/ethtool-5.12/configure
--- old/ethtool-5.10/configure 2020-12-16 16:39:41.000000000 +0100
+++ new/ethtool-5.12/configure 2021-05-02 22:29:08.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ethtool 5.10.
+# Generated by GNU Autoconf 2.69 for ethtool 5.12.
#
# Report bugs to <net...@vger.kernel.org>.
#
@@ -580,8 +580,8 @@
# Identity of this package.
PACKAGE_NAME='ethtool'
PACKAGE_TARNAME='ethtool'
-PACKAGE_VERSION='5.10'
-PACKAGE_STRING='ethtool 5.10'
+PACKAGE_VERSION='5.12'
+PACKAGE_STRING='ethtool 5.12'
PACKAGE_BUGREPORT='net...@vger.kernel.org'
PACKAGE_URL=''
@@ -1254,7 +1254,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures ethtool 5.10 to adapt to many kinds of systems.
+\`configure' configures ethtool 5.12 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1320,7 +1320,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ethtool 5.10:";;
+ short | recursive ) echo "Configuration of ethtool 5.12:";;
esac
cat <<\_ACEOF
@@ -1430,7 +1430,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ethtool configure 5.10
+ethtool configure 5.12
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1677,7 +1677,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ethtool $as_me 5.10, which was
+It was created by ethtool $as_me 5.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2542,7 +2542,7 @@
# Define the identity of the package.
PACKAGE='ethtool'
- VERSION='5.10'
+ VERSION='5.12'
cat >>confdefs.h <<_ACEOF
@@ -5122,7 +5122,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ethtool $as_me 5.10, which was
+This file was extended by ethtool $as_me 5.12, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5188,7 +5188,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //;
s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-ethtool config.status 5.10
+ethtool config.status 5.12
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/configure.ac
new/ethtool-5.12/configure.ac
--- old/ethtool-5.10/configure.ac 2020-12-16 16:31:47.000000000 +0100
+++ new/ethtool-5.12/configure.ac 2021-05-02 21:55:59.000000000 +0200
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(ethtool, 5.10, net...@vger.kernel.org)
+AC_INIT(ethtool, 5.12, net...@vger.kernel.org)
AC_PREREQ(2.52)
AC_CONFIG_SRCDIR([ethtool.c])
AM_INIT_AUTOMAKE([gnu subdir-objects])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/ethtool.8 new/ethtool-5.12/ethtool.8
--- old/ethtool-5.10/ethtool.8 2020-12-16 16:39:42.000000000 +0100
+++ new/ethtool-5.12/ethtool.8 2021-05-02 22:29:09.000000000 +0200
@@ -117,7 +117,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "Dec 2020" "Ethtool version 5.10"
+.TH ETHTOOL 8 "May 2021" "Ethtool version 5.12"
.SH NAME
ethtool \- query or control network driver and hardware settings
.
@@ -251,6 +251,7 @@
.B ethtool \-s
.I devname
.BN speed
+.BN lanes
.B2 duplex half full
.B4 port tp aui bnc mii fibre da
.B3 mdix auto on off
@@ -685,6 +686,9 @@
.B ethtool
with just the device name as an argument will show you the supported device
speeds.
.TP
+.BI lanes \ N
+Set number of lanes.
+.TP
.A2 duplex half full
Sets full or half duplex mode.
.TP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/ethtool.8.in
new/ethtool-5.12/ethtool.8.in
--- old/ethtool-5.10/ethtool.8.in 2020-12-16 16:31:32.000000000 +0100
+++ new/ethtool-5.12/ethtool.8.in 2021-05-02 22:05:20.000000000 +0200
@@ -117,7 +117,7 @@
. hy \\n(HY
..
.
-.TH ETHTOOL 8 "Dec 2020" "Ethtool version @VERSION@"
+.TH ETHTOOL 8 "May 2021" "Ethtool version @VERSION@"
.SH NAME
ethtool \- query or control network driver and hardware settings
.
@@ -251,6 +251,7 @@
.B ethtool \-s
.I devname
.BN speed
+.BN lanes
.B2 duplex half full
.B4 port tp aui bnc mii fibre da
.B3 mdix auto on off
@@ -685,6 +686,9 @@
.B ethtool
with just the device name as an argument will show you the supported device
speeds.
.TP
+.BI lanes \ N
+Set number of lanes.
+.TP
.A2 duplex half full
Sets full or half duplex mode.
.TP
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/ethtool.c new/ethtool-5.12/ethtool.c
--- old/ethtool-5.10/ethtool.c 2020-12-15 23:07:04.000000000 +0100
+++ new/ethtool-5.12/ethtool.c 2021-04-23 23:13:08.000000000 +0200
@@ -72,6 +72,16 @@
exit(1);
}
+static void exit_nlonly_param(const char *name) __attribute__((noreturn));
+
+static void exit_nlonly_param(const char *name)
+{
+ fprintf(stderr,
+ "ethtool: parameter '%s' can be used only with netlink\n",
+ name);
+ exit(1);
+}
+
typedef enum {
CMDL_NONE,
CMDL_BOOL,
@@ -3066,6 +3076,8 @@
ARRAY_SIZE(cmdline_msglvl));
break;
}
+ } else if (!strcmp(argp[i], "master-slave")) {
+ exit_nlonly_param(argp[i]);
} else {
exit_bad_args();
}
@@ -5620,6 +5632,7 @@
.nlfunc = nl_sset,
.help = "Change generic options",
.xhelp = " [ speed %d ]\n"
+ " [ lanes %d ]\n"
" [ duplex half|full ]\n"
" [ port tp|aui|bnc|mii|fibre|da ]\n"
" [ mdix auto|on|off ]\n"
@@ -5630,7 +5643,7 @@
" [ wol %d[/%d] | p|u|m|b|a|g|s|f|d...
]\n"
" [ sopass %x:%x:%x:%x:%x:%x ]\n"
" [ msglvl %d[/%d] | type on|off ... [--]
]\n"
- " [ master-slave
master-preferred|slave-preferred|master-force|slave-force ]\n"
+ " [ master-slave
preferred-master|preferred-slave|forced-master|forced-slave ]\n"
},
{
.opts = "-a|--show-pause",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/ethtool.spec
new/ethtool-5.12/ethtool.spec
--- old/ethtool-5.10/ethtool.spec 2020-12-16 16:39:42.000000000 +0100
+++ new/ethtool-5.12/ethtool.spec 2021-05-02 22:29:09.000000000 +0200
@@ -1,5 +1,5 @@
Name : ethtool
-Version : 5.10
+Version : 5.12
Release : 1
Group : Utilities
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/netlink/desc-ethtool.c
new/ethtool-5.12/netlink/desc-ethtool.c
--- old/ethtool-5.10/netlink/desc-ethtool.c 2020-10-21 11:41:59.000000000
+0200
+++ new/ethtool-5.12/netlink/desc-ethtool.c 2021-04-23 23:12:12.000000000
+0200
@@ -87,6 +87,7 @@
NLATTR_DESC_U8(ETHTOOL_A_LINKMODES_DUPLEX),
NLATTR_DESC_U8(ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG),
NLATTR_DESC_U8(ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE),
+ NLATTR_DESC_U32(ETHTOOL_A_LINKMODES_LANES),
};
static const struct pretty_nla_desc __linkstate_desc[] = {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/netlink/netlink.c
new/ethtool-5.12/netlink/netlink.c
--- old/ethtool-5.10/netlink/netlink.c 2020-12-15 23:07:04.000000000 +0100
+++ new/ethtool-5.12/netlink/netlink.c 2021-05-02 21:54:09.000000000 +0200
@@ -351,7 +351,8 @@
}
}
-static int family_info_cb(const struct nlmsghdr *nlhdr, void *data)
+static int __maybe_unused family_info_cb(const struct nlmsghdr *nlhdr,
+ void *data)
{
struct nl_context *nlctx = data;
struct nlattr *attr;
@@ -377,7 +378,8 @@
}
#ifdef TEST_ETHTOOL
-static int get_genl_family(struct nl_context *nlctx, struct nl_socket *nlsk)
+static int get_genl_family(struct nl_context *nlctx __maybe_unused,
+ struct nl_socket *nlsk __maybe_unused)
{
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/netlink/settings.c
new/ethtool-5.12/netlink/settings.c
--- old/ethtool-5.10/netlink/settings.c 2020-12-15 23:07:04.000000000 +0100
+++ new/ethtool-5.12/netlink/settings.c 2021-04-23 22:07:10.000000000 +0200
@@ -473,6 +473,12 @@
else
printf("\tSpeed: %uMb/s\n", val);
}
+ if (tb[ETHTOOL_A_LINKMODES_LANES]) {
+ uint32_t val = mnl_attr_get_u32(tb[ETHTOOL_A_LINKMODES_LANES]);
+
+ print_banner(nlctx);
+ printf("\tLanes: %u\n", val);
+ }
if (tb[ETHTOOL_A_LINKMODES_DUPLEX]) {
uint8_t val = mnl_attr_get_u8(tb[ETHTOOL_A_LINKMODES_DUPLEX]);
@@ -1067,6 +1073,13 @@
.handler = nl_parse_direct_u32,
.min_argc = 1,
},
+ {
+ .arg = "lanes",
+ .group = ETHTOOL_MSG_LINKMODES_SET,
+ .type = ETHTOOL_A_LINKMODES_LANES,
+ .handler = nl_parse_direct_u32,
+ .min_argc = 1,
+ },
{
.arg = "duplex",
.group = ETHTOOL_MSG_LINKMODES_SET,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/shell-completion/bash/ethtool
new/ethtool-5.12/shell-completion/bash/ethtool
--- old/ethtool-5.10/shell-completion/bash/ethtool 2020-02-14
09:58:31.000000000 +0100
+++ new/ethtool-5.12/shell-completion/bash/ethtool 2021-04-23
22:07:10.000000000 +0200
@@ -97,6 +97,7 @@
[speed]=notseen
[wol]=notseen
[xcvr]=notseen
+ [lanes]=notseen
)
local -A msgtypes=(
@@ -175,6 +176,9 @@
xcvr)
COMPREPLY=( $( compgen -W 'internal external' -- "$cur"
) )
return ;;
+ lanes)
+ # Number
+ return ;;
esac
local -a comp_words=()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/test-cmdline.c
new/ethtool-5.12/test-cmdline.c
--- old/ethtool-5.10/test-cmdline.c 2020-09-28 15:21:26.000000000 +0200
+++ new/ethtool-5.12/test-cmdline.c 2021-05-02 21:54:09.000000000 +0200
@@ -300,7 +300,7 @@
{ 1, "-0" },
};
-int send_ioctl(struct cmd_context *ctx, void *cmd)
+int send_ioctl(struct cmd_context *ctx __maybe_unused, void *cmd
__maybe_unused)
{
/* If we get this far then parsing succeeded */
test_exit(0);
@@ -310,7 +310,8 @@
struct nl_socket;
struct nl_msg_buff;
-ssize_t nlsock_sendmsg(struct nl_socket *nlsk, struct nl_msg_buff *altbuff)
+ssize_t nlsock_sendmsg(struct nl_socket *nlsk __maybe_unused,
+ struct nl_msg_buff *altbuff __maybe_unused)
{
/* If we get this far then parsing succeeded */
test_exit(0);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/test-common.c
new/ethtool-5.12/test-common.c
--- old/ethtool-5.10/test-common.c 2020-08-07 14:31:03.000000000 +0200
+++ new/ethtool-5.12/test-common.c 2021-05-02 21:54:23.000000000 +0200
@@ -293,12 +293,14 @@
int test_cmdline(const char *args)
{
- int argc, i;
- char **argv;
+ int volatile orig_stdout_fd = -1;
+ int volatile orig_stderr_fd = -1;
+ char **volatile argv;
+ int volatile argc;
+ int dev_null = -1;
const char *arg;
size_t len;
- int dev_null = -1, orig_stdout_fd = -1, orig_stderr_fd = -1;
- int rc;
+ int rc, i;
/* Convert line to argv */
argc = 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/uapi/linux/ethtool.h
new/ethtool-5.12/uapi/linux/ethtool.h
--- old/ethtool-5.10/uapi/linux/ethtool.h 2020-12-15 23:06:44.000000000
+0100
+++ new/ethtool-5.12/uapi/linux/ethtool.h 2021-04-23 23:12:12.000000000
+0200
@@ -14,7 +14,7 @@
#ifndef _LINUX_ETHTOOL_H
#define _LINUX_ETHTOOL_H
-#include <linux/kernel.h>
+#include <linux/const.h>
#include <linux/types.h>
#include <linux/if_ether.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/uapi/linux/ethtool_netlink.h
new/ethtool-5.12/uapi/linux/ethtool_netlink.h
--- old/ethtool-5.10/uapi/linux/ethtool_netlink.h 2020-12-15
23:06:44.000000000 +0100
+++ new/ethtool-5.12/uapi/linux/ethtool_netlink.h 2021-04-23
23:12:12.000000000 +0200
@@ -227,6 +227,7 @@
ETHTOOL_A_LINKMODES_DUPLEX, /* u8 */
ETHTOOL_A_LINKMODES_MASTER_SLAVE_CFG, /* u8 */
ETHTOOL_A_LINKMODES_MASTER_SLAVE_STATE, /* u8 */
+ ETHTOOL_A_LINKMODES_LANES, /* u32 */
/* add new constants above here */
__ETHTOOL_A_LINKMODES_CNT,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/uapi/linux/if_link.h
new/ethtool-5.12/uapi/linux/if_link.h
--- old/ethtool-5.10/uapi/linux/if_link.h 2020-12-15 23:06:44.000000000
+0100
+++ new/ethtool-5.12/uapi/linux/if_link.h 2021-04-23 22:39:45.000000000
+0200
@@ -75,8 +75,9 @@
*
* @rx_dropped: Number of packets received but not processed,
* e.g. due to lack of resources or unsupported protocol.
- * For hardware interfaces this counter should not include packets
- * dropped by the device which are counted separately in
+ * For hardware interfaces this counter may include packets discarded
+ * due to L2 address filtering but should not include packets dropped
+ * by the device due to buffer exhaustion which are counted separately in
* @rx_missed_errors (since procfs folds those two counters together).
*
* @tx_dropped: Number of packets dropped on their way to transmission,
@@ -522,6 +523,8 @@
IFLA_BRPORT_BACKUP_PORT,
IFLA_BRPORT_MRP_RING_OPEN,
IFLA_BRPORT_MRP_IN_OPEN,
+ IFLA_BRPORT_MCAST_EHT_HOSTS_LIMIT,
+ IFLA_BRPORT_MCAST_EHT_HOSTS_CNT,
__IFLA_BRPORT_MAX
};
#define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -586,6 +589,8 @@
IFLA_MACVLAN_MACADDR,
IFLA_MACVLAN_MACADDR_DATA,
IFLA_MACVLAN_MACADDR_COUNT,
+ IFLA_MACVLAN_BC_QUEUE_LEN,
+ IFLA_MACVLAN_BC_QUEUE_LEN_USED,
__IFLA_MACVLAN_MAX,
};
@@ -804,6 +809,7 @@
IFLA_GTP_FD1,
IFLA_GTP_PDP_HASHSIZE,
IFLA_GTP_ROLE,
+ IFLA_GTP_COLLECT_METADATA,
__IFLA_GTP_MAX,
};
#define IFLA_GTP_MAX (__IFLA_GTP_MAX - 1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/uapi/linux/netlink.h
new/ethtool-5.12/uapi/linux/netlink.h
--- old/ethtool-5.10/uapi/linux/netlink.h 2020-12-15 23:06:44.000000000
+0100
+++ new/ethtool-5.12/uapi/linux/netlink.h 2021-04-23 22:35:17.000000000
+0200
@@ -2,7 +2,7 @@
#ifndef __LINUX_NETLINK_H
#define __LINUX_NETLINK_H
-#include <linux/kernel.h>
+#include <linux/const.h>
#include <linux/socket.h> /* for __kernel_sa_family_t */
#include <linux/types.h>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/ethtool-5.10/uapi/linux/rtnetlink.h
new/ethtool-5.12/uapi/linux/rtnetlink.h
--- old/ethtool-5.10/uapi/linux/rtnetlink.h 2020-12-15 23:06:44.000000000
+0100
+++ new/ethtool-5.12/uapi/linux/rtnetlink.h 2021-04-23 23:12:12.000000000
+0200
@@ -396,11 +396,13 @@
#define RTNH_F_DEAD 1 /* Nexthop is dead (used by multipath)
*/
#define RTNH_F_PERVASIVE 2 /* Do recursive gateway lookup */
#define RTNH_F_ONLINK 4 /* Gateway is forced on link */
-#define RTNH_F_OFFLOAD 8 /* offloaded route */
+#define RTNH_F_OFFLOAD 8 /* Nexthop is offloaded */
#define RTNH_F_LINKDOWN 16 /* carrier-down on nexthop */
#define RTNH_F_UNRESOLVED 32 /* The entry is unresolved (ipmr) */
+#define RTNH_F_TRAP 64 /* Nexthop is trapping packets */
-#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN | RTNH_F_OFFLOAD)
+#define RTNH_COMPARE_MASK (RTNH_F_DEAD | RTNH_F_LINKDOWN | \
+ RTNH_F_OFFLOAD | RTNH_F_TRAP)
/* Macros to handle hexthops */
@@ -764,12 +766,18 @@
#define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))
/* tcamsg flags stored in attribute TCA_ROOT_FLAGS
*
- * TCA_FLAG_LARGE_DUMP_ON user->kernel to request for larger than
TCA_ACT_MAX_PRIO
- * actions in a dump. All dump responses will contain the number of actions
- * being dumped stored in for user app's consumption in TCA_ROOT_COUNT
+ * TCA_ACT_FLAG_LARGE_DUMP_ON user->kernel to request for larger than
+ * TCA_ACT_MAX_PRIO actions in a dump. All dump responses will contain the
+ * number of actions being dumped stored in for user app's consumption in
+ * TCA_ROOT_COUNT
+ *
+ * TCA_ACT_FLAG_TERSE_DUMP user->kernel to request terse (brief) dump that only
+ * includes essential action info (kind, index, etc.)
*
*/
#define TCA_FLAG_LARGE_DUMP_ON (1 << 0)
+#define TCA_ACT_FLAG_LARGE_DUMP_ON TCA_FLAG_LARGE_DUMP_ON
+#define TCA_ACT_FLAG_TERSE_DUMP (1 << 1)
/* New extended info filters for IFLA_EXT_MASK */
#define RTEXT_FILTER_VF (1 << 0)
@@ -777,6 +785,8 @@
#define RTEXT_FILTER_BRVLAN_COMPRESSED (1 << 2)
#define RTEXT_FILTER_SKIP_STATS (1 << 3)
#define RTEXT_FILTER_MRP (1 << 4)
+#define RTEXT_FILTER_CFM_CONFIG (1 << 5)
+#define RTEXT_FILTER_CFM_STATUS (1 << 6)
/* End of information exported to user level */
