Update kernel headers

Update kernel headers to commit
a804e5e218754 ("selftests: forwarding: test for bridge sticky flag")

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

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 8eb284d2f1acb37d1a1e7b6b42d8cdcf831623c0..abb7f7748c2de75c16d3e59aa8db9149db288762 100644 (file)
--- 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 24a861c0d29d3d936ef0110b9ec378c4a8cfc4b4..065408e16a807be59fec72ae7a9fec99b8fd383f 100644 (file)
--- 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 a924606f36e56f76043d782041dbf217fb73cbc5..c4dd87f9b44a17d771e47be1c9808111c387303f 100644 (file)
--- 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 cd136a6f821bba495f19e933aeec6eb6e08ccd5b..dbfbc227deb8ed7d2e4b696e601e40f838bf57e3 100644 (file)
--- 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 f4a97151b9a5887559a8ca92629ac8becc1f7f3f..9c254603ebdad1a0c7e9196fe5ba1dc24f65c959 100644 (file)
--- 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,
@@ -552,6 +553,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 67b61d91d89bf4fc8a54e01ffa3ca253a7fc45c9..467b654bd4c7df2aab3e8db892dbd14739ff21fd 100644 (file)
--- 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 409bb3f3aed67f7a88a4a16a93fd3a47aeeb671d..2bb132a97333e55a7e67900f77c0666666b4d297 100644 (file)
--- 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 904db614847667eb4f75584113738d232e069dd6..998155444e0db77cc6af8f350e18fab59ed808d2 100644 (file)
--- 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 be382fb0592d8e74a74a490d3914ab0207b81cdc..401d0c1e612d3a291688cf6f90e4d2803f7c09dd 100644 (file)
--- 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 8975fd1a1421f58952abed4b9d54f839711268df..e9b7244ac3819b7cf56c912a2337aa0e1bde820c 100644 (file)
--- a/include/uapi/linux/pkt_sched.h
+++ b/include/uapi/linux/pkt_sched.h
@@ -395,9 +395,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 */