update headers from 4.14 merge

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

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 32b7221dd7180f8d061a9730be2b64a1a513f860..b94acdc07364a40ed1eec405b9e983031b14a168 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -758,6 +758,8 @@ struct bpf_sock {
        __u32 family;
        __u32 type;
        __u32 protocol;
+       __u32 mark;
+       __u32 priority;
 };
 
 #define XDP_PACKET_HEADROOM 256

diff --git a/include/linux/devlink.h b/include/linux/devlink.h
index 83a125cfcb9d8f6f4f63949d4402001726059844..a62695e2d86e85310cdb9f3e4336cfb33670542a 100644 (file)
--- a/include/linux/devlink.h
+++ b/include/linux/devlink.h
@@ -234,9 +234,14 @@ enum devlink_dpipe_field_ipv4_id {
        DEVLINK_DPIPE_FIELD_IPV4_DST_IP,
 };
 
+enum devlink_dpipe_field_ipv6_id {
+       DEVLINK_DPIPE_FIELD_IPV6_DST_IP,
+};
+
 enum devlink_dpipe_header_id {
        DEVLINK_DPIPE_HEADER_ETHERNET,
        DEVLINK_DPIPE_HEADER_IPV4,
+       DEVLINK_DPIPE_HEADER_IPV6,
 };
 
 #endif /* _LINUX_DEVLINK_H_ */

diff --git a/include/linux/if_arp.h b/include/linux/if_arp.h
index 8ce598b9636930f113ac15ea7d931bbdfc0f734b..199f253bd1f66c01f8dcbcdb534de3fa61492113 100644 (file)
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
@@ -59,6 +59,7 @@
 #define ARPHRD_LAPB    516             /* LAPB                         */
 #define ARPHRD_DDCMP    517            /* Digital's DDCMP protocol     */
 #define ARPHRD_RAWHDLC 518             /* Raw HDLC                     */
+#define ARPHRD_RAWIP    519            /* Raw IP                       */
 
 #define ARPHRD_TUNNEL  768             /* IPIP tunnel                  */
 #define ARPHRD_TUNNEL6 769             /* IP6IP6 tunnel                */

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index a39acec58123c9992f9dc791632c257baa57b951..7dde037a0cca635eaa96418c247c54983385f1b0 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -140,6 +140,9 @@
 #define ETH_P_IEEE802154 0x00F6                /* IEEE802.15.4 frame           */
 #define ETH_P_CAIF     0x00F7          /* ST-Ericsson CAIF protocol    */
 #define ETH_P_XDSA     0x00F8          /* Multiplexed DSA protocol     */
+#define ETH_P_MAP      0x00F9          /* Qualcomm multiplexing and
+                                        * aggregation protocol
+                                        */
 
 /*
  *     This is an Ethernet frame header.

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index c51a7051fc8d15685447fba6a19f7066b25bd75f..bada4d7b6c8e60ca8d73f57da7445cda91e594f3 100644 (file)
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -143,6 +143,7 @@ enum {
        INET_DIAG_MARK,
        INET_DIAG_BBRINFO,
        INET_DIAG_CLASS_ID,
+       INET_DIAG_MD5SIG,
        __INET_DIAG_MAX,
 };
 

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 654f08adb7e8855b961186ab10cb139640cf12cd..ec0690b5064710111b3b44be61dd12d852398e6d 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -69,6 +69,9 @@ struct nlmsghdr {
 #define NLM_F_CREATE   0x400   /* Create, if it does not exist */
 #define NLM_F_APPEND   0x800   /* Add to end of list           */
 
+/* Modifiers to DELETE request */
+#define NLM_F_NONREC   0x100   /* Do not delete recursively    */
+
 /* Flags for ACK message */
 #define NLM_F_CAPPED   0x100   /* request was capped */
 #define NLM_F_ACK_TLVS 0x200   /* extended ACK TVLs were included */

diff --git a/include/linux/tcp.h b/include/linux/tcp.h
index 8d0545e6396cf4034ef4691794a37e938787f1a1..8edad3f9426869dd5a464dddb414c54cc52d2deb 100644 (file)
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
@@ -256,4 +256,13 @@ struct tcp_md5sig {
        __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];         /* key (binary) */
 };
 
+/* INET_DIAG_MD5SIG */
+struct tcp_diag_md5sig {
+       __u8    tcpm_family;
+       __u8    tcpm_prefixlen;
+       __u16   tcpm_keylen;
+       __be32  tcpm_addr[4];
+       __u8    tcpm_key[TCP_MD5SIG_MAXKEYLEN];
+};
+
 #endif /* _LINUX_TCP_H */