update kernel headers to 4.9-net-next

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index d4a6e1f91728afc268e5de3fbd49f164e6c747e4..5c8191aeb885fd3e703858044766c3c8aff09a3c 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -426,6 +426,12 @@ enum bpf_func_id {
         */
        BPF_FUNC_set_hash_invalid,
 
+       /**
+        * bpf_get_numa_node_id()
+        * Returns the id of the current NUMA node.
+        */
+       BPF_FUNC_get_numa_node_id,
+
        __BPF_FUNC_MAX_ID,
 };
 

diff --git a/include/linux/if_ether.h b/include/linux/if_ether.h
index 51898e048691987472a1afb6e5700cef17975120..6ff4a72163d63ac940880a58d024e6b6d9377bda 100644 (file)
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
@@ -35,6 +35,9 @@
 #define ETH_FRAME_LEN  1514            /* Max. octets in frame sans FCS */
 #define ETH_FCS_LEN    4               /* Octets in the FCS             */
 
+#define ETH_MIN_MTU    68              /* Min IPv4 MTU per RFC791      */
+#define ETH_MAX_MTU    0xFFFFU         /* 65535, same as IP_MAX_MTU    */
+
 /*
  *     These are the defined Ethernet Protocol ID's.
  */

diff --git a/include/linux/inet_diag.h b/include/linux/inet_diag.h
index f5f5c1b8e7276c55e31621d00afec86ba600a2f5..f7bf7819e9243f83436ff6cc16deea162b3089f6 100644 (file)
--- a/include/linux/inet_diag.h
+++ b/include/linux/inet_diag.h
@@ -43,6 +43,23 @@ struct inet_diag_req_v2 {
        struct inet_diag_sockid id;
 };
 
+/*
+ * SOCK_RAW sockets require the underlied protocol to be
+ * additionally specified so we can use @pad member for
+ * this, but we can't rename it because userspace programs
+ * still may depend on this name. Instead lets use another
+ * structure definition as an alias for struct
+ * @inet_diag_req_v2.
+ */
+struct inet_diag_req_raw {
+       __u8    sdiag_family;
+       __u8    sdiag_protocol;
+       __u8    idiag_ext;
+       __u8    sdiag_raw_protocol;
+       __u32   idiag_states;
+       struct inet_diag_sockid id;
+};
+
 enum {
        INET_DIAG_REQ_NONE,
        INET_DIAG_REQ_BYTECODE,