From b70c39e968db6cb67d64526cafd72fc0763d959a Mon Sep 17 00:00:00 2001

From: Danielle Ratson <danieller@nvidia.com>

Date: Wed, 10 Feb 2021 15:48:36 +0200

Subject: [PATCH 38/42] update UAPI header copies

Update to kernel commit 012ce4dd3102.

Signed-off-by: Danielle Ratson <danieller@nvidia.com>

Signed-off-by: Michal Kubecek <mkubecek@suse.cz>

(cherry picked from commit 18e509526a727c594c29622489437c7376f44d32)

---

 uapi/linux/ethtool.h         |  2 +-

 uapi/linux/ethtool_netlink.h |  1 +

 uapi/linux/if_link.h         | 10 ++++++++--

 uapi/linux/netlink.h         |  2 +-

 uapi/linux/rtnetlink.h       | 20 +++++++++++++++-----

 5 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/uapi/linux/ethtool.h b/uapi/linux/ethtool.h

index 052689bcc90c..a951137bdba9 100644

--- a/uapi/linux/ethtool.h

+++ b/uapi/linux/ethtool.h

@@ -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 --git a/uapi/linux/ethtool_netlink.h b/uapi/linux/ethtool_netlink.h

index c022883cdb22..0cd6906aa5d5 100644

--- a/uapi/linux/ethtool_netlink.h

+++ b/uapi/linux/ethtool_netlink.h

@@ -227,6 +227,7 @@ enum {

 	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 --git a/uapi/linux/if_link.h b/uapi/linux/if_link.h

index 307e5c245e9f..c96880c51c93 100644

--- a/uapi/linux/if_link.h

+++ b/uapi/linux/if_link.h

@@ -75,8 +75,9 @@ struct rtnl_link_stats {

  *

  * @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 @@ enum {

 	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 @@ enum {

 	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 @@ enum {

 	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 --git a/uapi/linux/netlink.h b/uapi/linux/netlink.h

index dfef006be9f9..5024c5435749 100644

--- a/uapi/linux/netlink.h

+++ b/uapi/linux/netlink.h

@@ -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 --git a/uapi/linux/rtnetlink.h b/uapi/linux/rtnetlink.h

index 5ad84e663d01..c66fd247d90a 100644

--- a/uapi/linux/rtnetlink.h

+++ b/uapi/linux/rtnetlink.h

@@ -396,11 +396,13 @@ struct rtnexthop {

 #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 @@ enum {

 #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 @@ enum {

 #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 */

-- 

2.31.1