update kernel headers from net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index ee3ea150ac716311bc750ba19410311fc4634e23..65baf0c623bfcc029fb068de1dd387978866e866 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -95,6 +95,7 @@ enum bpf_prog_type {
        BPF_PROG_TYPE_SCHED_ACT,
        BPF_PROG_TYPE_TRACEPOINT,
        BPF_PROG_TYPE_XDP,
+       BPF_PROG_TYPE_PERF_EVENT,
 };
 
 #define BPF_PSEUDO_MAP_FD      1

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 1feb708902acc3e90a83d2f11ac306b9e1131ac9..b9299e33f45b0daafcd9daab001fad7bdd80ed02 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -316,6 +316,7 @@ enum {
        IFLA_BRPORT_FLUSH,
        IFLA_BRPORT_MULTICAST_ROUTER,
        IFLA_BRPORT_PAD,
+       IFLA_BRPORT_MCAST_FLOOD,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -461,6 +462,7 @@ enum {
 enum ipvlan_mode {
        IPVLAN_MODE_L2 = 0,
        IPVLAN_MODE_L3,
+       IPVLAN_MODE_L3S,
        IPVLAN_MODE_MAX
 };
 
@@ -823,6 +825,7 @@ enum {
        IFLA_STATS_LINK_64,
        IFLA_STATS_LINK_XSTATS,
        IFLA_STATS_LINK_XSTATS_SLAVE,
+       IFLA_STATS_LINK_OFFLOAD_XSTATS,
        __IFLA_STATS_MAX,
 };
 
@@ -842,6 +845,14 @@ enum {
 };
 #define LINK_XSTATS_TYPE_MAX (__LINK_XSTATS_TYPE_MAX - 1)
 
+/* These are stats embedded into IFLA_STATS_LINK_OFFLOAD_XSTATS */
+enum {
+       IFLA_OFFLOAD_XSTATS_UNSPEC,
+       IFLA_OFFLOAD_XSTATS_CPU_HIT, /* struct rtnl_link_stats64 */
+       __IFLA_OFFLOAD_XSTATS_MAX
+};
+#define IFLA_OFFLOAD_XSTATS_MAX (__IFLA_OFFLOAD_XSTATS_MAX - 1)
+
 /* XDP section */
 
 enum {

diff --git a/include/linux/if_tunnel.h b/include/linux/if_tunnel.h
index e0c3c0a30d175356d8c6d64db61b5ae08fe7b095..777150fe8177f98fb050cd4457763a0cb8d75fce 100644 (file)
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
@@ -73,6 +73,7 @@ enum {
        IFLA_IPTUN_ENCAP_FLAGS,
        IFLA_IPTUN_ENCAP_SPORT,
        IFLA_IPTUN_ENCAP_DPORT,
+       IFLA_IPTUN_COLLECT_METADATA,
        __IFLA_IPTUN_MAX,
 };
 #define IFLA_IPTUN_MAX (__IFLA_IPTUN_MAX - 1)

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index 408cebdad4cd6bcde91e519d1282179d474474f7..f5f5c1b8e7276c55e31621d00afec86ba600a2f5 100644 (file)
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -123,6 +123,8 @@ enum {
        INET_DIAG_LOCALS,
        INET_DIAG_PEERS,
        INET_DIAG_PAD,
+       INET_DIAG_MARK,
+       INET_DIAG_BBRINFO,
        __INET_DIAG_MAX,
 };
 
@@ -156,8 +158,20 @@ struct tcp_dctcp_info {
        __u32   dctcp_ab_tot;
 };
 
+/* INET_DIAG_BBRINFO */
+
+struct tcp_bbr_info {
+       /* u64 bw: max-filtered BW (app throughput) estimate in Byte per sec: */
+       __u32   bbr_bw_lo;              /* lower 32 bits of bw */
+       __u32   bbr_bw_hi;              /* upper 32 bits of bw */
+       __u32   bbr_min_rtt;            /* min-filtered RTT in uSec */
+       __u32   bbr_pacing_gain;        /* pacing gain shifted left 8 bits */
+       __u32   bbr_cwnd_gain;          /* cwnd gain shifted left 8 bits */
+};
+
 union tcp_cc_info {
        struct tcpvegas_info    vegas;
        struct tcp_dctcp_info   dctcp;
+       struct tcp_bbr_info     bbr;
 };
 #endif /* _INET_DIAG_H_ */

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index a50bcc2f38a93b392caf7e450b98d4a91b4d0402..5e6e903ab803c69b4421cf3814cf7658cbcf62a5 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -374,9 +374,24 @@ enum {
        TCA_FLOWER_KEY_UDP_DST,         /* be16 */
 
        TCA_FLOWER_FLAGS,
-       TCA_FLOWER_KEY_VLAN_ID,
-       TCA_FLOWER_KEY_VLAN_PRIO,
-       TCA_FLOWER_KEY_VLAN_ETH_TYPE,
+       TCA_FLOWER_KEY_VLAN_ID,         /* be16 */
+       TCA_FLOWER_KEY_VLAN_PRIO,       /* u8   */
+       TCA_FLOWER_KEY_VLAN_ETH_TYPE,   /* be16 */
+
+       TCA_FLOWER_KEY_ENC_KEY_ID,      /* be32 */
+       TCA_FLOWER_KEY_ENC_IPV4_SRC,    /* be32 */
+       TCA_FLOWER_KEY_ENC_IPV4_SRC_MASK,/* be32 */
+       TCA_FLOWER_KEY_ENC_IPV4_DST,    /* be32 */
+       TCA_FLOWER_KEY_ENC_IPV4_DST_MASK,/* be32 */
+       TCA_FLOWER_KEY_ENC_IPV6_SRC,    /* struct in6_addr */
+       TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK,/* struct in6_addr */
+       TCA_FLOWER_KEY_ENC_IPV6_DST,    /* struct in6_addr */
+       TCA_FLOWER_KEY_ENC_IPV6_DST_MASK,/* struct in6_addr */
+
+       TCA_FLOWER_KEY_TCP_SRC_MASK,    /* be16 */
+       TCA_FLOWER_KEY_TCP_DST_MASK,    /* be16 */
+       TCA_FLOWER_KEY_UDP_SRC_MASK,    /* be16 */
+       TCA_FLOWER_KEY_UDP_DST_MASK,    /* be16 */
        __TCA_FLOWER_MAX,
 };
 

diff --git a/include/linux/pkt_sched.h b/include/linux/pkt_sched.h
index 2382eed502783c23cf6f6dca8a4cca6157480d20..f8e39dbaa7815b2bd70c2dca1154771a09caae96 100644 (file)
--- a/include/linux/pkt_sched.h
+++ b/include/linux/pkt_sched.h
@@ -792,6 +792,8 @@ enum {
 
        TCA_FQ_ORPHAN_MASK,     /* mask applied to orphaned skb hashes */
 
+       TCA_FQ_LOW_RATE_THRESHOLD, /* per packet delay under this rate */
+
        __TCA_FQ_MAX
 };
 

diff --git a/include/linux/tc_act/tc_ife.h b/include/linux/tc_act/tc_ife.h
index 4ece02a77b9aa567ca02f859735c815f064bb63f..cd18360eca249be09c6a649efcb53a147ed76fd2 100644 (file)
--- a/include/linux/tc_act/tc_ife.h
+++ b/include/linux/tc_act/tc_ife.h
@@ -32,8 +32,9 @@ enum {
 #define IFE_META_HASHID 2
 #define        IFE_META_PRIO 3
 #define        IFE_META_QMAP 4
+#define        IFE_META_TCINDEX 5
 /*Can be overridden at runtime by module option*/
-#define        __IFE_META_MAX 5
+#define        __IFE_META_MAX 6
 #define IFE_META_MAX (__IFE_META_MAX - 1)
 
 #endif

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index f3dcdb77785db390fb9bcdcb4161275216e3be2f..cffa3bbeeda416fa9c32aa09576bc6cfc6317eb6 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -167,6 +167,7 @@ struct tcp_info {
        __u8    tcpi_backoff;
        __u8    tcpi_options;
        __u8    tcpi_snd_wscale : 4, tcpi_rcv_wscale : 4;
+       __u8    tcpi_delivery_rate_app_limited:1;
 
        __u32   tcpi_rto;
        __u32   tcpi_ato;
@@ -211,6 +212,8 @@ struct tcp_info {
        __u32   tcpi_min_rtt;
        __u32   tcpi_data_segs_in;      /* RFC4898 tcpEStatsDataSegsIn */
        __u32   tcpi_data_segs_out;     /* RFC4898 tcpEStatsDataSegsOut */
+
+       __u64   tcpi_delivery_rate;
 };
 
 /* for TCP_MD5SIG socket option */