update kernel headers from net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 3398b5de8305d32d2e267e96c0b90480302cdff9..ce6d03ee08c612ccb6223d5431c3253d4833c7d3 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -347,6 +347,10 @@ enum bpf_func_id {
 #define BPF_F_ZERO_CSUM_TX             (1ULL << 1)
 #define BPF_F_DONT_FRAGMENT            (1ULL << 2)
 
+/* BPF_FUNC_perf_event_output flags. */
+#define BPF_F_INDEX_MASK               0xffffffffULL
+#define BPF_F_CURRENT_CPU              BPF_F_INDEX_MASK
+
 /* user accessible mirror of in-kernel sk_buff.
  * new fields can only be added to the end of this structure
  */

diff --git a/include/linux/devlink.h b/include/linux/devlink.h
index ba0073b26fa66fb185353347231b5fdd37a4e1d8..0e21d001f879b8e59fc3faa975c00b475a3c763f 100644 (file)
--- a/include/linux/devlink.h
+++ b/include/linux/devlink.h
@@ -9,8 +9,8 @@
  * (at your option) any later version.
  */
 
-#ifndef _UAPI_LINUX_DEVLINK_H_
-#define _UAPI_LINUX_DEVLINK_H_
+#ifndef _LINUX_DEVLINK_H_
+#define _LINUX_DEVLINK_H_
 
 #define DEVLINK_GENL_NAME "devlink"
 #define DEVLINK_GENL_VERSION 0x1
@@ -132,4 +132,4 @@ enum devlink_attr {
        DEVLINK_ATTR_MAX = __DEVLINK_ATTR_MAX - 1
 };
 
-#endif /* _UAPI_LINUX_DEVLINK_H_ */
+#endif /* _LINUX_DEVLINK_H_ */

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 8f3b0f40ee26f26d9b88c5b6af296d57303a4e25..c396f3179e2cce44c62e8963cc45f26237a894e7 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -92,6 +92,7 @@
 #define ETH_P_TDLS     0x890D          /* TDLS */
 #define ETH_P_FIP      0x8914          /* FCoE Initialization Protocol */
 #define ETH_P_80221    0x8917          /* IEEE 802.21 Media Independent Handover Protocol */
+#define ETH_P_HSR      0x892F          /* IEC 62439-3 HSRv1    */
 #define ETH_P_LOOPBACK 0x9000          /* Ethernet loopback packet, per IEEE 802.3 */
 #define ETH_P_QINQ1    0x9100          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */
 #define ETH_P_QINQ2    0x9200          /* deprecated QinQ VLAN [ NOT AN OFFICIALLY REGISTERED ID ] */

diff --git a/include/linux/if_link.h b/include/linux/if_link.h
index e296f2938fa8088034597cd2fb7f384bca8af508..0a7abb11fcb824831fbe4c075a31b17909d3ff79 100644 (file)
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
@@ -155,6 +155,7 @@ enum {
        IFLA_PROTO_DOWN,
        IFLA_GSO_MAX_SEGS,
        IFLA_GSO_MAX_SIZE,
+       IFLA_PAD,
        __IFLA_MAX
 };
 
@@ -773,9 +774,33 @@ enum {
        IFLA_HSR_MULTICAST_SPEC,        /* Last byte of supervision addr */
        IFLA_HSR_SUPERVISION_ADDR,      /* Supervision frame multicast addr */
        IFLA_HSR_SEQ_NR,
+       IFLA_HSR_VERSION,               /* HSR version */
        __IFLA_HSR_MAX,
 };
 
 #define IFLA_HSR_MAX (__IFLA_HSR_MAX - 1)
 
+/* STATS section */
+
+struct if_stats_msg {
+       __u8  family;
+       __u8  pad1;
+       __u16 pad2;
+       __u32 ifindex;
+       __u32 filter_mask;
+};
+
+/* A stats attribute can be netdev specific or a global stat.
+ * For netdev stats, lets use the prefix IFLA_STATS_LINK_*
+ */
+enum {
+       IFLA_STATS_UNSPEC, /* also used as 64bit pad attribute */
+       IFLA_STATS_LINK_64,
+       __IFLA_STATS_MAX,
+};
+
+#define IFLA_STATS_MAX (__IFLA_STATS_MAX - 1)
+
+#define IFLA_STATS_FILTER_BIT(ATTR)    (1 << (ATTR - 1))
+
 #endif /* _LINUX_IF_LINK_H */

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 6aaa2a3e3c0a35d59b33fd8aec0de23809070494..ae8b02a50adee9e45907508a668439f8695e8f35 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -139,6 +139,11 @@ enum {
        RTM_GETNSID = 90,
 #define RTM_GETNSID RTM_GETNSID
 
+       RTM_NEWSTATS = 92,
+#define RTM_NEWSTATS RTM_NEWSTATS
+       RTM_GETSTATS = 94,
+#define RTM_GETSTATS RTM_GETSTATS
+
        __RTM_MAX,
 #define RTM_MAX                (((__RTM_MAX + 3) & ~3) - 1)
 };
@@ -312,6 +317,7 @@ enum rtattr_type_t {
        RTA_ENCAP_TYPE,
        RTA_ENCAP,
        RTA_EXPIRES,
+       RTA_PAD,
        __RTA_MAX
 };