update kernel headers from net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 973ab6ee4d41e5088c497969158388941895a9a7..3994b26a8e5ded350eb647c22e9b00e44ac8610b 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -63,6 +63,12 @@ struct bpf_insn {
        __s32   imm;            /* signed immediate constant */
 };
 
+/* Key of an a BPF_MAP_TYPE_LPM_TRIE entry */
+struct bpf_lpm_trie_key {
+       __u32   prefixlen;      /* up to 32 for AF_INET, 128 for AF_INET6 */
+       __u8    data[0];        /* Arbitrary size */
+};
+
 /* BPF syscall commands, see bpf(2) man-page for details. */
 enum bpf_cmd {
        BPF_MAP_CREATE,
@@ -89,6 +95,7 @@ enum bpf_map_type {
        BPF_MAP_TYPE_CGROUP_ARRAY,
        BPF_MAP_TYPE_LRU_HASH,
        BPF_MAP_TYPE_LRU_PERCPU_HASH,
+       BPF_MAP_TYPE_LPM_TRIE,
 };
 
 enum bpf_prog_type {
@@ -515,6 +522,7 @@ enum bpf_func_id {
 /* BPF_FUNC_l4_csum_replace flags. */
 #define BPF_F_PSEUDO_HDR               (1ULL << 4)
 #define BPF_F_MARK_MANGLED_0           (1ULL << 5)
+#define BPF_F_MARK_ENFORCE             (1ULL << 6)
 
 /* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
 #define BPF_F_INGRESS                  (1ULL << 0)

diff --git a/include/linux/can/netlink.h b/include/linux/can/netlink.h
index 6d4ec2a9dbc10a6de0e399f5f08fc8ae103570bb..b9214bd7aa2bc592eb352b627eb42627ca1460ee 100644 (file)
--- a/include/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
@@ -127,9 +127,16 @@ enum {
        IFLA_CAN_BERR_COUNTER,
        IFLA_CAN_DATA_BITTIMING,
        IFLA_CAN_DATA_BITTIMING_CONST,
+       IFLA_CAN_TERMINATION,
+       IFLA_CAN_TERMINATION_CONST,
+       IFLA_CAN_BITRATE_CONST,
+       IFLA_CAN_DATA_BITRATE_CONST,
        __IFLA_CAN_MAX
 };
 
 #define IFLA_CAN_MAX   (__IFLA_CAN_MAX - 1)
 
+/* u16 termination range: 1..65535 Ohms */
+#define CAN_TERMINATION_DISABLED 0
+
 #endif /* !_UAPI_CAN_NETLINK_H */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index aee9f5f308f337b3a500dd1c1d1d9bdd00ac05a7..51185d36c312e4472e26090dc10595a6bee139f3 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -319,6 +319,7 @@ enum {
        IFLA_BRPORT_MULTICAST_ROUTER,
        IFLA_BRPORT_PAD,
        IFLA_BRPORT_MCAST_FLOOD,
+       IFLA_BRPORT_MCAST_TO_UCAST,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)

diff --git a/include/linux/ipv6.h b/include/linux/ipv6.h
index 265057af0cbc2d6957e98a832e1c0912b1f581c3..26ee549f6180d238728208c86dda1fdef519f143 100644 (file)
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
@@ -182,6 +182,7 @@ enum {
        DEVCONF_SEG6_ENABLED,
        DEVCONF_SEG6_REQUIRE_HMAC,
        DEVCONF_ENHANCED_DAD,
+       DEVCONF_ADDR_GEN_MODE,
        DEVCONF_MAX
 };
 

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index fd373ebd5a442f8da63517c675a114f49b5a2ad7..345551e7141011827625c88b3e941b77b0ddbb0b 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -4,6 +4,8 @@
 #include <linux/types.h>
 #include <linux/pkt_sched.h>
 
+#define TC_COOKIE_MAX_SIZE 16
+
 /* Action attributes */
 enum {
        TCA_ACT_UNSPEC,
@@ -12,6 +14,7 @@ enum {
        TCA_ACT_INDEX,
        TCA_ACT_STATS,
        TCA_ACT_PAD,
+       TCA_ACT_COOKIE,
        __TCA_ACT_MAX
 };
 

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 646c488f97c8dedb582ad8a8b38be5206ae05217..f8a9a8edf96713fad4030f8b1cf10e856e1f08e2 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -116,6 +116,7 @@ enum {
 #define TCP_SAVE_SYN           27      /* Record SYN headers for new connections */
 #define TCP_SAVED_SYN          28      /* Get SYN headers recorded for connection */
 #define TCP_REPAIR_WINDOW      29      /* Get/set window parameters */
+#define TCP_FASTOPEN_CONNECT   30      /* Attempt FastOpen with connect */
 
 struct tcp_repair_opt {
        __u32   opt_code;