update headers to 4.11 net-next

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

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index eedf24d637764e6c99677d46618a5d1ac8e0104e..6b491a81b35369112cd8c7e4feb7e71253d74b71 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -481,8 +481,7 @@ union bpf_attr {
  * u32 bpf_get_socket_uid(skb)
  *     Get the owner uid of the socket stored inside sk_buff.
  *     @skb: pointer to skb
- *     Return: uid of the socket owner on success or 0 if the socket pointer
- *     inside sk_buff is NULL
+ *     Return: uid of the socket owner on success or overflowuid if failed.
  */
 #define __BPF_FUNC_MAPPER(FN)          \
        FN(unspec),                     \

diff --git a/include/linux/devlink.h b/include/linux/devlink.h
index 0c8af618b4701252b12ebce59b767d5eaf4516f7..7644005045540ac71f3e0e8de3f7f415163b77eb 100644 (file)
--- a/include/linux/devlink.h
+++ b/include/linux/devlink.h
@@ -119,6 +119,11 @@ enum devlink_eswitch_inline_mode {
        DEVLINK_ESWITCH_INLINE_MODE_TRANSPORT,
 };
 
+enum devlink_eswitch_encap_mode {
+       DEVLINK_ESWITCH_ENCAP_MODE_NONE,
+       DEVLINK_ESWITCH_ENCAP_MODE_BASIC,
+};
+
 enum devlink_attr {
        /* don't change the order or add anything between, this is ABI! */
        DEVLINK_ATTR_UNSPEC,
@@ -195,6 +200,8 @@ enum devlink_attr {
 
        DEVLINK_ATTR_PAD,
 
+       DEVLINK_ATTR_ESWITCH_ENCAP_MODE,        /* u8 */
+
        /* add new attributes above here, update the policy in devlink.c */
 
        __DEVLINK_ATTR_MAX,

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index d001bdb276b764df4b18227b7f513998f1605ba2..8ce598b9636930f113ac15ea7d931bbdfc0f734b 100644 (file)
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -95,6 +95,7 @@
 #define ARPHRD_IP6GRE  823             /* GRE over IPv6                */
 #define ARPHRD_NETLINK 824             /* Netlink header               */
 #define ARPHRD_6LOWPAN 825             /* IPv6 over LoWPAN             */
+#define ARPHRD_VSOCKMON        826             /* Vsock monitor header         */
 
 #define ARPHRD_VOID      0xFFFF        /* Void type, nothing is known */
 #define ARPHRD_NONE      0xFFFE        /* zero header length */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index 2bb46f08ef6b3fd6ffdaa150e0479f4071b0ef11..2dfb6387ff4066743defce631ef836f20bd1b24f 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -321,6 +321,7 @@ enum {
        IFLA_BRPORT_MCAST_FLOOD,
        IFLA_BRPORT_MCAST_TO_UCAST,
        IFLA_BRPORT_VLAN_TUNNEL,
+       IFLA_BRPORT_BCAST_FLOOD,
        __IFLA_BRPORT_MAX
 };
 #define IFLA_BRPORT_MAX (__IFLA_BRPORT_MAX - 1)
@@ -885,7 +886,9 @@ enum {
 /* XDP section */
 
 #define XDP_FLAGS_UPDATE_IF_NOEXIST    (1U << 0)
-#define XDP_FLAGS_MASK                 (XDP_FLAGS_UPDATE_IF_NOEXIST)
+#define XDP_FLAGS_SKB_MODE             (2U << 0)
+#define XDP_FLAGS_MASK                 (XDP_FLAGS_UPDATE_IF_NOEXIST | \
+                                        XDP_FLAGS_SKB_MODE)
 
 enum {
        IFLA_XDP_UNSPEC,

diff --git a/include/linux/if_packet.h b/include/linux/if_packet.h
index 9e7edfd8141e5dea69129807f46b89b2b637ead9..4df96a7dd4fae591d834735046911337221c60d3 100644 (file)
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
@@ -66,6 +66,7 @@ struct sockaddr_ll {
 #define PACKET_FANOUT_CBPF             6
 #define PACKET_FANOUT_EBPF             7
 #define PACKET_FANOUT_FLAG_ROLLOVER    0x1000
+#define PACKET_FANOUT_FLAG_UNIQUEID    0x2000
 #define PACKET_FANOUT_FLAG_DEFRAG      0x8000
 
 struct tpacket_stats {

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 7a69f2a4ca0c06a68487ff382c6b84f8acab323b..f1129e383b2a47ad96890e06355ccb6223332c2b 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -432,6 +432,11 @@ enum {
        TCA_FLOWER_KEY_ARP_THA,         /* ETH_ALEN */
        TCA_FLOWER_KEY_ARP_THA_MASK,    /* ETH_ALEN */
 
+       TCA_FLOWER_KEY_MPLS_TTL,        /* u8 - 8 bits */
+       TCA_FLOWER_KEY_MPLS_BOS,        /* u8 - 1 bit */
+       TCA_FLOWER_KEY_MPLS_TC,         /* u8 - 3 bits */
+       TCA_FLOWER_KEY_MPLS_LABEL,      /* be32 - 20 bits */
+
        __TCA_FLOWER_MAX,
 };