From 821d2b6a1350f69b350a3413fc08845f68788077 Mon Sep 17 00:00:00 2001

From: Andrea Claudi <aclaudi@redhat.com>

Date: Tue, 21 Apr 2020 14:53:23 +0200

Subject: [PATCH] Update kernel headers

Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1637437

Upstream Status: iproute2.git commit d9c0be4e97954

commit d9c0be4e9795473a73793058674c34d56cdb5eea

Author: David Ahern <dsahern@gmail.com>

Date:   Fri Sep 28 10:51:15 2018 -0700

    Update kernel headers

    Update kernel headers to commit

    a804e5e218754 ("selftests: forwarding: test for bridge sticky flag")

    Signed-off-by: David Ahern <dsahern@gmail.com>

---

 include/uapi/linux/bpf.h       | 26 ++++++++++++++++++++++++++

 include/uapi/linux/gen_stats.h |  1 +

 include/uapi/linux/if_addr.h   |  1 +

 include/uapi/linux/if_arp.h    | 18 +++++++++---------

 include/uapi/linux/if_link.h   |  2 ++

 include/uapi/linux/if_packet.h |  1 +

 include/uapi/linux/in6.h       |  1 +

 include/uapi/linux/neighbour.h |  1 +

 include/uapi/linux/pkt_cls.h   |  2 ++

 include/uapi/linux/pkt_sched.h |  6 +++---

 10 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h

index 8eb284d2f1acb..abb7f7748c2de 100644

--- a/include/uapi/linux/bpf.h

+++ b/include/uapi/linux/bpf.h

@@ -152,6 +152,7 @@ enum bpf_prog_type {

 	BPF_PROG_TYPE_LWT_SEG6LOCAL,

 	BPF_PROG_TYPE_LIRC_MODE2,

 	BPF_PROG_TYPE_SK_REUSEPORT,

+	BPF_PROG_TYPE_FLOW_DISSECTOR,

 };

 enum bpf_attach_type {

@@ -172,6 +173,7 @@ enum bpf_attach_type {

 	BPF_CGROUP_UDP4_SENDMSG,

 	BPF_CGROUP_UDP6_SENDMSG,

 	BPF_LIRC_MODE2,

+	BPF_FLOW_DISSECTOR,

 	__MAX_BPF_ATTACH_TYPE

 };

@@ -2333,6 +2335,7 @@ struct __sk_buff {

 	/* ... here. */

 	__u32 data_meta;

+	struct bpf_flow_keys *flow_keys;

 };

 struct bpf_tunnel_key {

@@ -2778,4 +2781,27 @@ enum bpf_task_fd_type {

 	BPF_FD_TYPE_URETPROBE,		/* filename + offset */

 };

+struct bpf_flow_keys {

+	__u16	nhoff;

+	__u16	thoff;

+	__u16	addr_proto;			/* ETH_P_* of valid addrs */

+	__u8	is_frag;

+	__u8	is_first_frag;

+	__u8	is_encap;

+	__u8	ip_proto;

+	__be16	n_proto;

+	__be16	sport;

+	__be16	dport;

+	union {

+		struct {

+			__be32	ipv4_src;

+			__be32	ipv4_dst;

+		};

+		struct {

+			__u32	ipv6_src[4];	/* in6_addr; network order */

+			__u32	ipv6_dst[4];	/* in6_addr; network order */

+		};

+	};

+};

+

 #endif /* __LINUX_BPF_H__ */

diff --git a/include/uapi/linux/gen_stats.h b/include/uapi/linux/gen_stats.h

index 24a861c0d29d3..065408e16a807 100644

--- a/include/uapi/linux/gen_stats.h

+++ b/include/uapi/linux/gen_stats.h

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

 	TCA_STATS_APP,

 	TCA_STATS_RATE_EST64,

 	TCA_STATS_PAD,

+	TCA_STATS_BASIC_HW,

 	__TCA_STATS_MAX,

 };

 #define TCA_STATS_MAX (__TCA_STATS_MAX - 1)

diff --git a/include/uapi/linux/if_addr.h b/include/uapi/linux/if_addr.h

index a924606f36e56..c4dd87f9b44a1 100644

--- a/include/uapi/linux/if_addr.h

+++ b/include/uapi/linux/if_addr.h

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

 	IFA_MULTICAST,

 	IFA_FLAGS,

 	IFA_RT_PRIORITY,  /* u32, priority/metric for prefix route */

+	IFA_TARGET_NETNSID,

 	__IFA_MAX,

 };

diff --git a/include/uapi/linux/if_arp.h b/include/uapi/linux/if_arp.h

index cd136a6f821bb..dbfbc227deb8e 100644

--- a/include/uapi/linux/if_arp.h

+++ b/include/uapi/linux/if_arp.h

@@ -114,18 +114,18 @@

 /* ARP ioctl request. */

 struct arpreq {

-  struct sockaddr	arp_pa;		/* protocol address		*/

-  struct sockaddr	arp_ha;		/* hardware address		*/

-  int			arp_flags;	/* flags			*/

-  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */

-  char			arp_dev[16];

+	struct sockaddr	arp_pa;		/* protocol address		 */

+	struct sockaddr	arp_ha;		/* hardware address		 */

+	int		arp_flags;	/* flags			 */

+	struct sockaddr arp_netmask;    /* netmask (only for proxy arps) */

+	char		arp_dev[IFNAMSIZ];

 };

 struct arpreq_old {

-  struct sockaddr	arp_pa;		/* protocol address		*/

-  struct sockaddr	arp_ha;		/* hardware address		*/

-  int			arp_flags;	/* flags			*/

-  struct sockaddr       arp_netmask;    /* netmask (only for proxy arps) */

+	struct sockaddr	arp_pa;		/* protocol address		 */

+	struct sockaddr	arp_ha;		/* hardware address		 */

+	int		arp_flags;	/* flags			 */

+	struct sockaddr	arp_netmask;    /* netmask (only for proxy arps) */

 };

 /* ARP Flag values. */

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h

index 1caf56584a690..502b065f0614b 100644

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

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

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

 	IFLA_EVENT,

 	IFLA_NEW_NETNSID,

 	IFLA_IF_NETNSID,

+	IFLA_TARGET_NETNSID = IFLA_IF_NETNSID, /* new alias */

 	IFLA_CARRIER_UP_COUNT,

 	IFLA_CARRIER_DOWN_COUNT,

 	IFLA_NEW_IFINDEX,

@@ -551,6 +552,7 @@ enum {

 	IFLA_GENEVE_UDP_ZERO_CSUM6_TX,

 	IFLA_GENEVE_UDP_ZERO_CSUM6_RX,

 	IFLA_GENEVE_LABEL,

+	IFLA_GENEVE_TTL_INHERIT,

 	__IFLA_GENEVE_MAX

 };

 #define IFLA_GENEVE_MAX	(__IFLA_GENEVE_MAX - 1)

diff --git a/include/uapi/linux/if_packet.h b/include/uapi/linux/if_packet.h

index 67b61d91d89bf..467b654bd4c7d 100644

--- a/include/uapi/linux/if_packet.h

+++ b/include/uapi/linux/if_packet.h

@@ -57,6 +57,7 @@ struct sockaddr_ll {

 #define PACKET_QDISC_BYPASS		20

 #define PACKET_ROLLOVER_STATS		21

 #define PACKET_FANOUT_DATA		22

+#define PACKET_IGNORE_OUTGOING		23

 #define PACKET_FANOUT_HASH		0

 #define PACKET_FANOUT_LB		1

diff --git a/include/uapi/linux/in6.h b/include/uapi/linux/in6.h

index 409bb3f3aed67..2bb132a97333e 100644

--- a/include/uapi/linux/in6.h

+++ b/include/uapi/linux/in6.h

@@ -177,6 +177,7 @@ struct in6_flowlabel_req {

 #define IPV6_V6ONLY		26

 #define IPV6_JOIN_ANYCAST	27

 #define IPV6_LEAVE_ANYCAST	28

+#define IPV6_MULTICAST_ALL	29

 /* IPV6_MTU_DISCOVER values */

 #define IPV6_PMTUDISC_DONT		0

diff --git a/include/uapi/linux/neighbour.h b/include/uapi/linux/neighbour.h

index 904db61484766..998155444e0db 100644

--- a/include/uapi/linux/neighbour.h

+++ b/include/uapi/linux/neighbour.h

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

 #define NTF_PROXY	0x08	/* == ATF_PUBL */

 #define NTF_EXT_LEARNED	0x10

 #define NTF_OFFLOADED   0x20

+#define NTF_STICKY	0x40

 #define NTF_ROUTER	0x80

 /*

diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h

index be382fb0592d8..401d0c1e612d3 100644

--- a/include/uapi/linux/pkt_cls.h

+++ b/include/uapi/linux/pkt_cls.h

@@ -483,6 +483,8 @@ enum {

 	TCA_FLOWER_KEY_ENC_OPTS,

 	TCA_FLOWER_KEY_ENC_OPTS_MASK,

+	TCA_FLOWER_IN_HW_COUNT,

+

 	__TCA_FLOWER_MAX,

 };

diff --git a/include/uapi/linux/pkt_sched.h b/include/uapi/linux/pkt_sched.h

index d9cc9dc4f547c..76ba49b0ec65f 100644

--- a/include/uapi/linux/pkt_sched.h

+++ b/include/uapi/linux/pkt_sched.h

@@ -380,9 +380,9 @@ enum {

 struct tc_htb_xstats {

 	__u32 lends;

 	__u32 borrows;

-	__u32 giants;	/* too big packets (rate will not be accurate) */

-	__u32 tokens;

-	__u32 ctokens;

+	__u32 giants;	/* unused since 'Make HTB scheduler work with TSO.' */

+	__s32 tokens;

+	__s32 ctokens;

 };

 /* HFSC section */

-- 

2.25.3