update kernel headers

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 546d4ceca0db5aa7e6b4ff98d2ab281aa67a59c3..19e0c36a4a8ca26c9bf1a26b4dfa2005d41dba87 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -365,6 +365,16 @@ enum bpf_func_id {
         */
        BPF_FUNC_get_current_task,
 
+       /**
+        * bpf_probe_write_user(void *dst, void *src, int len)
+        * safely attempt to write to a location
+        * @dst: destination address in userspace
+        * @src: source address on stack
+        * @len: number of bytes to copy
+        * Return: 0 on success or negative error
+        */
+       BPF_FUNC_probe_write_user,
+
        __BPF_FUNC_MAX_ID,
 };
 

diff --git a/include/linux/if_macsec.h b/include/linux/if_macsec.h
index cbd4faa353f41a52989c36491155b6a2b66c5a73..22939a3ec8ea2730f06537703469a1b47e48d37b 100644 (file)
--- a/include/linux/if_macsec.h
+++ b/include/linux/if_macsec.h
@@ -26,6 +26,8 @@
 
 #define MACSEC_MIN_ICV_LEN 8
 #define MACSEC_MAX_ICV_LEN 32
+/* upper limit for ICV length as recommended by IEEE802.1AE-2006 */
+#define MACSEC_STD_ICV_LEN 16
 
 enum macsec_attrs {
        MACSEC_ATTR_UNSPEC,

diff --git a/include/linux/in6.h b/include/linux/in6.h
index aa5b66df68c58b183c36657d0cd8ef1249e4b45a..45aaaa40ff0e371eaa7e5452dbc8aa8338d1be56 100644 (file)
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
@@ -143,6 +143,7 @@ struct in6_flowlabel_req {
 #define IPV6_TLV_PAD1          0
 #define IPV6_TLV_PADN          1
 #define IPV6_TLV_ROUTERALERT   5
+#define IPV6_TLV_CALIPSO       7       /* RFC 5570 */
 #define IPV6_TLV_JUMBO         194
 #define IPV6_TLV_HAO           201     /* home address option */
 

diff --git a/include/linux/pkt_cls.h b/include/linux/pkt_cls.h
index 44cda25497556beb530c1ff79c4ec75e54aff831..5e6c61e7f47b64e0c93497e2167d6cc22e3ac5c1 100644 (file)
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
@@ -379,6 +379,18 @@ enum {
 
 #define TCA_FLOWER_MAX (__TCA_FLOWER_MAX - 1)
 
+/* Match-all classifier */
+
+enum {
+       TCA_MATCHALL_UNSPEC,
+       TCA_MATCHALL_CLASSID,
+       TCA_MATCHALL_ACT,
+       TCA_MATCHALL_FLAGS,
+       __TCA_MATCHALL_MAX,
+};
+
+#define TCA_MATCHALL_MAX (__TCA_MATCHALL_MAX - 1)
+
 /* Extended Matches */
 
 struct tcf_ematch_tree_hdr {

diff --git a/include/linux/tipc.h b/include/linux/tipc.h
index ebd3b63ca279b037d9059c02fc7c85a9908f5c0b..400430084808b827cd709de532710eaa03cdefa4 100644 (file)
--- a/include/linux/tipc.h
+++ b/include/linux/tipc.h
@@ -60,26 +60,48 @@ struct tipc_name_seq {
        __u32 upper;
 };
 
+/* TIPC Address Size, Offset, Mask specification for Z.C.N
+ */
+#define TIPC_NODE_BITS          12
+#define TIPC_CLUSTER_BITS       12
+#define TIPC_ZONE_BITS          8
+
+#define TIPC_NODE_OFFSET        0
+#define TIPC_CLUSTER_OFFSET     TIPC_NODE_BITS
+#define TIPC_ZONE_OFFSET        (TIPC_CLUSTER_OFFSET + TIPC_CLUSTER_BITS)
+
+#define TIPC_NODE_SIZE          ((1UL << TIPC_NODE_BITS) - 1)
+#define TIPC_CLUSTER_SIZE       ((1UL << TIPC_CLUSTER_BITS) - 1)
+#define TIPC_ZONE_SIZE          ((1UL << TIPC_ZONE_BITS) - 1)
+
+#define TIPC_NODE_MASK         (TIPC_NODE_SIZE << TIPC_NODE_OFFSET)
+#define TIPC_CLUSTER_MASK      (TIPC_CLUSTER_SIZE << TIPC_CLUSTER_OFFSET)
+#define TIPC_ZONE_MASK         (TIPC_ZONE_SIZE << TIPC_ZONE_OFFSET)
+
+#define TIPC_ZONE_CLUSTER_MASK (TIPC_ZONE_MASK | TIPC_CLUSTER_MASK)
+
 static __inline__ __u32 tipc_addr(unsigned int zone,
                              unsigned int cluster,
                              unsigned int node)
 {
-       return (zone << 24) | (cluster << 12) | node;
+       return (zone << TIPC_ZONE_OFFSET) |
+               (cluster << TIPC_CLUSTER_OFFSET) |
+               node;
 }
 
 static __inline__ unsigned int tipc_zone(__u32 addr)
 {
-       return addr >> 24;
+       return addr >> TIPC_ZONE_OFFSET;
 }
 
 static __inline__ unsigned int tipc_cluster(__u32 addr)
 {
-       return (addr >> 12) & 0xfff;
+       return (addr & TIPC_CLUSTER_MASK) >> TIPC_CLUSTER_OFFSET;
 }
 
 static __inline__ unsigned int tipc_node(__u32 addr)
 {
-       return addr & 0xfff;
+       return addr & TIPC_NODE_MASK;
 }
 
 /*

diff --git a/include/linux/tipc_netlink.h b/include/linux/tipc_netlink.h
index d4c8f142ba633d8e96d5a227ce1d91dc79c70235..5f3f6d09fb790b80854c63008f3bb77f0ba484c6 100644 (file)
--- a/include/linux/tipc_netlink.h
+++ b/include/linux/tipc_netlink.h
@@ -56,6 +56,9 @@ enum {
        TIPC_NL_NET_GET,
        TIPC_NL_NET_SET,
        TIPC_NL_NAME_TABLE_GET,
+       TIPC_NL_MON_SET,
+       TIPC_NL_MON_GET,
+       TIPC_NL_MON_PEER_GET,
 
        __TIPC_NL_CMD_MAX,
        TIPC_NL_CMD_MAX = __TIPC_NL_CMD_MAX - 1
@@ -72,6 +75,8 @@ enum {
        TIPC_NLA_NODE,                  /* nest */
        TIPC_NLA_NET,                   /* nest */
        TIPC_NLA_NAME_TABLE,            /* nest */
+       TIPC_NLA_MON,                   /* nest */
+       TIPC_NLA_MON_PEER,              /* nest */
 
        __TIPC_NLA_MAX,
        TIPC_NLA_MAX = __TIPC_NLA_MAX - 1
@@ -166,6 +171,20 @@ enum {
        TIPC_NLA_NAME_TABLE_MAX = __TIPC_NLA_NAME_TABLE_MAX - 1
 };
 
+/* Monitor info */
+enum {
+       TIPC_NLA_MON_UNSPEC,
+       TIPC_NLA_MON_ACTIVATION_THRESHOLD,      /* u32 */
+       TIPC_NLA_MON_REF,                       /* u32 */
+       TIPC_NLA_MON_ACTIVE,                    /* flag */
+       TIPC_NLA_MON_BEARER_NAME,               /* string */
+       TIPC_NLA_MON_PEERCNT,                   /* u32 */
+       TIPC_NLA_MON_LISTGEN,                   /* u32 */
+
+       __TIPC_NLA_MON_MAX,
+       TIPC_NLA_MON_MAX = __TIPC_NLA_MON_MAX - 1
+};
+
 /* Publication info */
 enum {
        TIPC_NLA_PUBL_UNSPEC,
@@ -182,6 +201,24 @@ enum {
        TIPC_NLA_PUBL_MAX = __TIPC_NLA_PUBL_MAX - 1
 };
 
+/* Monitor peer info */
+enum {
+       TIPC_NLA_MON_PEER_UNSPEC,
+
+       TIPC_NLA_MON_PEER_ADDR,                 /* u32 */
+       TIPC_NLA_MON_PEER_DOMGEN,               /* u32 */
+       TIPC_NLA_MON_PEER_APPLIED,              /* u32 */
+       TIPC_NLA_MON_PEER_UPMAP,                /* u64 */
+       TIPC_NLA_MON_PEER_MEMBERS,              /* tlv */
+       TIPC_NLA_MON_PEER_UP,                   /* flag */
+       TIPC_NLA_MON_PEER_HEAD,                 /* flag */
+       TIPC_NLA_MON_PEER_LOCAL,                /* flag */
+       TIPC_NLA_MON_PEER_PAD,                  /* flag */
+
+       __TIPC_NLA_MON_PEER_MAX,
+       TIPC_NLA_MON_PEER_MAX = __TIPC_NLA_MON_PEER_MAX - 1
+};
+
 /* Nest, connection info */
 enum {
        TIPC_NLA_CON_UNSPEC,