Update kernel headers

Update kernel headers to commit
    9aaa29494030 ("Merge branch '1GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue")

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

diff --git a/include/uapi/linux/if_bridge.h b/include/uapi/linux/if_bridge.h
index 9fefc7f30d7b566fd01ad08a40c587dcb80d4179..18e8f3c4e28e396fc8546043a2f611ffd05e1a97 100644 (file)
--- a/include/uapi/linux/if_bridge.h
+++ b/include/uapi/linux/if_bridge.h
@@ -165,6 +165,35 @@ struct bridge_stp_xstats {
        __u64 tx_tcn;
 };
 
+/* Bridge vlan RTM header */
+struct br_vlan_msg {
+       __u8 family;
+       __u8 reserved1;
+       __u16 reserved2;
+       __u32 ifindex;
+};
+
+/* Bridge vlan RTM attributes
+ * [BRIDGE_VLANDB_ENTRY] = {
+ *     [BRIDGE_VLANDB_ENTRY_INFO]
+ *     ...
+ * }
+ */
+enum {
+       BRIDGE_VLANDB_UNSPEC,
+       BRIDGE_VLANDB_ENTRY,
+       __BRIDGE_VLANDB_MAX,
+};
+#define BRIDGE_VLANDB_MAX (__BRIDGE_VLANDB_MAX - 1)
+
+enum {
+       BRIDGE_VLANDB_ENTRY_UNSPEC,
+       BRIDGE_VLANDB_ENTRY_INFO,
+       BRIDGE_VLANDB_ENTRY_RANGE,
+       __BRIDGE_VLANDB_ENTRY_MAX,
+};
+#define BRIDGE_VLANDB_ENTRY_MAX (__BRIDGE_VLANDB_ENTRY_MAX - 1)
+
 /* Bridge multicast database attributes
  * [MDBA_MDB] = {
  *     [MDBA_MDB_ENTRY] = {

diff --git a/include/uapi/linux/if_link.h b/include/uapi/linux/if_link.h
index 29eac87e0e0f9eed9b217317741f2ababb0216a5..533abd2cfcb88f4ae4ddff9cb3a8e12ebeb7f0aa 100644 (file)
--- a/include/uapi/linux/if_link.h
+++ b/include/uapi/linux/if_link.h
@@ -484,6 +484,13 @@ enum macsec_validation_type {
        MACSEC_VALIDATE_MAX = __MACSEC_VALIDATE_END - 1,
 };
 
+enum macsec_offload {
+       MACSEC_OFFLOAD_OFF = 0,
+       MACSEC_OFFLOAD_PHY = 1,
+       __MACSEC_OFFLOAD_END,
+       MACSEC_OFFLOAD_MAX = __MACSEC_OFFLOAD_END - 1,
+};
+
 /* IPVLAN section */
 enum {
        IFLA_IPVLAN_UNSPEC,

diff --git a/include/uapi/linux/if_macsec.h b/include/uapi/linux/if_macsec.h
index 77439932561b99c4dca9c32823e6b985450fa038..33c32051ac366e2a977a3a9704000363820b63f7 100644 (file)
--- a/include/uapi/linux/if_macsec.h
+++ b/include/uapi/linux/if_macsec.h
@@ -45,6 +45,7 @@ enum macsec_attrs {
        MACSEC_ATTR_RXSC_LIST,   /* dump, nested, macsec_rxsc_attrs for each RXSC */
        MACSEC_ATTR_TXSC_STATS,  /* dump, nested, macsec_txsc_stats_attr */
        MACSEC_ATTR_SECY_STATS,  /* dump, nested, macsec_secy_stats_attr */
+       MACSEC_ATTR_OFFLOAD,     /* config, nested, macsec_offload_attrs */
        __MACSEC_ATTR_END,
        NUM_MACSEC_ATTR = __MACSEC_ATTR_END,
        MACSEC_ATTR_MAX = __MACSEC_ATTR_END - 1,
@@ -97,6 +98,15 @@ enum macsec_sa_attrs {
        MACSEC_SA_ATTR_MAX = __MACSEC_SA_ATTR_END - 1,
 };
 
+enum macsec_offload_attrs {
+       MACSEC_OFFLOAD_ATTR_UNSPEC,
+       MACSEC_OFFLOAD_ATTR_TYPE, /* config/dump, u8 0..2 */
+       MACSEC_OFFLOAD_ATTR_PAD,
+       __MACSEC_OFFLOAD_ATTR_END,
+       NUM_MACSEC_OFFLOAD_ATTR = __MACSEC_OFFLOAD_ATTR_END,
+       MACSEC_OFFLOAD_ATTR_MAX = __MACSEC_OFFLOAD_ATTR_END - 1,
+};
+
 enum macsec_nl_commands {
        MACSEC_CMD_GET_TXSC,
        MACSEC_CMD_ADD_RXSC,
@@ -108,6 +118,7 @@ enum macsec_nl_commands {
        MACSEC_CMD_ADD_RXSA,
        MACSEC_CMD_DEL_RXSA,
        MACSEC_CMD_UPD_RXSA,
+       MACSEC_CMD_UPD_OFFLOAD,
 };
 
 /* u64 per-RXSC stats */

diff --git a/include/uapi/linux/in.h b/include/uapi/linux/in.h
index ac079abcb8b222338efffe881b96f26246edf2cd..83a4c1874b593db81ab217dd024a6ebfe9fe4ee0 100644 (file)
--- a/include/uapi/linux/in.h
+++ b/include/uapi/linux/in.h
@@ -76,6 +76,8 @@ enum {
 #define IPPROTO_MPLS           IPPROTO_MPLS
   IPPROTO_RAW = 255,           /* Raw IP packets                       */
 #define IPPROTO_RAW            IPPROTO_RAW
+  IPPROTO_MPTCP = 262,         /* Multipath TCP connection             */
+#define IPPROTO_MPTCP          IPPROTO_MPTCP
   IPPROTO_MAX
 };
 #endif

diff --git a/include/uapi/linux/rtnetlink.h b/include/uapi/linux/rtnetlink.h
index 4b93791cdbd42f304e6f1811cba655e54c9f948d..9d802cd7f695b39fdbbaffc7b6665b59b935a278 100644 (file)
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
@@ -171,6 +171,13 @@ enum {
        RTM_GETLINKPROP,
 #define RTM_GETLINKPROP        RTM_GETLINKPROP
 
+       RTM_NEWVLAN = 112,
+#define RTM_NEWNVLAN   RTM_NEWVLAN
+       RTM_DELVLAN,
+#define RTM_DELVLAN    RTM_DELVLAN
+       RTM_GETVLAN,
+#define RTM_GETVLAN    RTM_GETVLAN
+
        __RTM_MAX,
 #define RTM_MAX                (((__RTM_MAX + 3) & ~3) - 1)
 };
@@ -309,6 +316,8 @@ enum rt_scope_t {
 #define RTM_F_PREFIX           0x800   /* Prefix addresses             */
 #define RTM_F_LOOKUP_TABLE     0x1000  /* set rtm_table to FIB lookup result */
 #define RTM_F_FIB_MATCH                0x2000  /* return full fib lookup match */
+#define RTM_F_OFFLOAD          0x4000  /* route is offloaded */
+#define RTM_F_TRAP             0x8000  /* route is trapping packets */
 
 /* Reserved table identifiers */
 
@@ -719,6 +728,8 @@ enum rtnetlink_groups {
 #define RTNLGRP_IPV6_MROUTE_R  RTNLGRP_IPV6_MROUTE_R
        RTNLGRP_NEXTHOP,
 #define RTNLGRP_NEXTHOP                RTNLGRP_NEXTHOP
+       RTNLGRP_BRVLAN,
+#define RTNLGRP_BRVLAN         RTNLGRP_BRVLAN
        __RTNLGRP_MAX
 };
 #define RTNLGRP_MAX    (__RTNLGRP_MAX - 1)

diff --git a/include/uapi/linux/tcp.h b/include/uapi/linux/tcp.h
index 9415cb9fe57ab1e5fa512f4fb996d7e9fac4d36d..0a2c423e12ead482ef9b30c98bdae3432e42045d 100644 (file)
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
@@ -317,14 +317,15 @@ enum {
 #define TCP_MD5SIG_MAXKEYLEN   80
 
 /* tcp_md5sig extension flags for TCP_MD5SIG_EXT */
-#define TCP_MD5SIG_FLAG_PREFIX         1       /* address prefix length */
+#define TCP_MD5SIG_FLAG_PREFIX         0x1     /* address prefix length */
+#define TCP_MD5SIG_FLAG_IFINDEX                0x2     /* ifindex set */
 
 struct tcp_md5sig {
        struct __kernel_sockaddr_storage tcpm_addr;     /* address associated */
        __u8    tcpm_flags;                             /* extension flags */
        __u8    tcpm_prefixlen;                         /* address prefix */
        __u16   tcpm_keylen;                            /* key length */
-       __u32   __tcpm_pad;                             /* zero */
+       int     tcpm_ifindex;                           /* device index for scope */
        __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
 };