update kernel headers from net-next

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index a536a24b1c288ac30be5c386b264620437722940..1f97d0560b6cbf111603fa9bbc7963bef90ae07e 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -889,15 +889,19 @@ enum {
 #define XDP_FLAGS_UPDATE_IF_NOEXIST    (1U << 0)
 #define XDP_FLAGS_SKB_MODE             (1U << 1)
 #define XDP_FLAGS_DRV_MODE             (1U << 2)
+#define XDP_FLAGS_HW_MODE              (1U << 3)
+#define XDP_FLAGS_MODES                        (XDP_FLAGS_SKB_MODE | \
+                                        XDP_FLAGS_DRV_MODE | \
+                                        XDP_FLAGS_HW_MODE)
 #define XDP_FLAGS_MASK                 (XDP_FLAGS_UPDATE_IF_NOEXIST | \
-                                        XDP_FLAGS_SKB_MODE | \
-                                        XDP_FLAGS_DRV_MODE)
+                                        XDP_FLAGS_MODES)
 
 /* These are stored into IFLA_XDP_ATTACHED on dump. */
 enum {
        XDP_ATTACHED_NONE = 0,
        XDP_ATTACHED_DRV,
        XDP_ATTACHED_SKB,
+       XDP_ATTACHED_HW,
 };
 
 enum {
@@ -905,6 +909,7 @@ enum {
        IFLA_XDP_FD,
        IFLA_XDP_ATTACHED,
        IFLA_XDP_FLAGS,
+       IFLA_XDP_PROG_ID,
        __IFLA_XDP_MAX,
 };
 

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 2055783e6ee9c33cb8d6ffe12b0f1a61e13a3af3..d5e2bf68d0d4038ab51a3799636ac16c1f63cf4f 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -369,6 +369,7 @@ enum {
        TCA_BPF_FLAGS,
        TCA_BPF_FLAGS_GEN,
        TCA_BPF_TAG,
+       TCA_BPF_ID,
        __TCA_BPF_MAX,
 };
 

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 6cb64fa75c2be784f4f9e08bfc912ab11b1c663d..1d62dad0dbc7bd978df56b323970c0d9041f10a4 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -146,6 +146,9 @@ enum {
        RTM_GETSTATS = 94,
 #define RTM_GETSTATS RTM_GETSTATS
 
+       RTM_NEWCACHEREPORT = 96,
+#define RTM_NEWCACHEREPORT RTM_NEWCACHEREPORT
+
        __RTM_MAX,
 #define RTM_MAX                (((__RTM_MAX + 3) & ~3) - 1)
 };
@@ -664,6 +667,10 @@ enum rtnetlink_groups {
 #define RTNLGRP_NSID           RTNLGRP_NSID
        RTNLGRP_MPLS_NETCONF,
 #define RTNLGRP_MPLS_NETCONF   RTNLGRP_MPLS_NETCONF
+       RTNLGRP_IPV4_MROUTE_R,
+#define RTNLGRP_IPV4_MROUTE_R  RTNLGRP_IPV4_MROUTE_R
+       RTNLGRP_IPV6_MROUTE_R,
+#define RTNLGRP_IPV6_MROUTE_R  RTNLGRP_IPV6_MROUTE_R
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX    (__RTNLGRP_MAX - 1)

diff --git a/include/linux/tc_act/tc_bpf.h b/include/linux/tc_act/tc_bpf.h
index 975b50dc8d1d466bb60c6279de7ebde1d05bd54f..8dc2ac05eecf05650a3ac0751385134559aaeddf 100644 (file)
--- a/include/linux/tc_act/tc_bpf.h
+++ b/include/linux/tc_act/tc_bpf.h
@@ -28,6 +28,7 @@ enum {
        TCA_ACT_BPF_NAME,
        TCA_ACT_BPF_PAD,
        TCA_ACT_BPF_TAG,
+       TCA_ACT_BPF_ID,
        __TCA_ACT_BPF_MAX,
 };
 #define TCA_ACT_BPF_MAX (__TCA_ACT_BPF_MAX - 1)

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index ca491dcd02c186e74835e9b63097e7c738399325..79b2d6fc9d72be32ae893b9d2387f4202526b17b 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -117,7 +117,8 @@ enum {
 #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 */
-#define TCP_ULP                31      /* Attach a ULP to a TCP connection */
+#define TCP_ULP                        31      /* Attach a ULP to a TCP connection */
+#define TCP_MD5SIG_EXT         32      /* TCP MD5 Signature with extensions */
 
 struct tcp_repair_opt {
        __u32   opt_code;
@@ -235,11 +236,15 @@ enum {
 /* for TCP_MD5SIG socket option */
 #define TCP_MD5SIG_MAXKEYLEN   80
 
+/* tcp_md5sig extension flags for TCP_MD5SIG_EXT */
+#define TCP_MD5SIG_FLAG_PREFIX         1       /* address prefix length */
+
 struct tcp_md5sig {
        struct __kernel_sockaddr_storage tcpm_addr;     /* address associated */
-       __u16   __tcpm_pad1;                            /* zero */
+       __u8    tcpm_flags;                             /* extension flags */
+       __u8    tcpm_prefixlen;                         /* address prefix */
        __u16   tcpm_keylen;                            /* key length */
-       __u32   __tcpm_pad2;                            /* zero */
+       __u32   __tcpm_pad;                             /* zero */
        __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
 };