update headers from 4.13-rc4

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

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 49e1def7a0b859084acb77a6f21d633d33d9be16..fb84d2c29199bffc2b3317fa6bab35f9d926cce0 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -104,7 +104,6 @@ enum bpf_map_type {
        BPF_MAP_TYPE_LPM_TRIE,
        BPF_MAP_TYPE_ARRAY_OF_MAPS,
        BPF_MAP_TYPE_HASH_OF_MAPS,
-       BPF_MAP_TYPE_DEVMAP,
 };
 
 enum bpf_prog_type {
@@ -348,11 +347,6 @@ union bpf_attr {
  *     @flags: bit 0 - if set, redirect to ingress instead of egress
  *             other bits - reserved
  *     Return: TC_ACT_REDIRECT
- * int bpf_redirect_map(key, map, flags)
- *     redirect to endpoint in map
- *     @key: index in map to lookup
- *     @map: fd of map to do lookup in
- *     @flags: --
  *
  * u32 bpf_get_route_realm(skb)
  *     retrieve a dst's tclassid
@@ -597,8 +591,7 @@ union bpf_attr {
        FN(get_socket_uid),             \
        FN(set_hash),                   \
        FN(setsockopt),                 \
-       FN(skb_adjust_room),            \
-       FN(redirect_map),
+       FN(skb_adjust_room),
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
  * function eBPF program intends to call
@@ -724,7 +717,6 @@ enum xdp_action {
        XDP_DROP,
        XDP_PASS,
        XDP_TX,
-       XDP_REDIRECT,
 };
 
 /* user accessible metadata for XDP packet hook

diff --git a/include/linux/netlink.h b/include/linux/netlink.h
index 654f08adb7e8855b961186ab10cb139640cf12cd..3a53b9aaafc55004231e2a07a54f0be3454a8771 100644 (file)
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
@@ -222,22 +222,5 @@ struct nlattr {
 #define NLA_ALIGN(len)         (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
 #define NLA_HDRLEN             ((int) NLA_ALIGN(sizeof(struct nlattr)))
 
-/* Generic 32 bitflags attribute content sent to the kernel.
- *
- * The value is a bitmap that defines the values being set
- * The selector is a bitmask that defines which value is legit
- *
- * Examples:
- *  value = 0x0, and selector = 0x1
- *  implies we are selecting bit 1 and we want to set its value to 0.
- *
- *  value = 0x2, and selector = 0x2
- *  implies we are selecting bit 2 and we want to set its value to 1.
- *
- */
-struct nla_bitfield32 {
-       __u32 value;
-       __u32 selector;
-};
 
 #endif /* __LINUX_NETLINK_H */

diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h
index 813e9e0767d3361f4eec0ea853e9e651644967a2..1d62dad0dbc7bd978df56b323970c0d9041f10a4 100644 (file)
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
@@ -681,29 +681,10 @@ struct tcamsg {
        unsigned char   tca__pad1;
        unsigned short  tca__pad2;
 };
-
-enum {
-       TCA_ROOT_UNSPEC,
-       TCA_ROOT_TAB,
-#define TCA_ACT_TAB TCA_ROOT_TAB
-#define TCAA_MAX TCA_ROOT_TAB
-       TCA_ROOT_FLAGS,
-       TCA_ROOT_COUNT,
-       TCA_ROOT_TIME_DELTA, /* in msecs */
-       __TCA_ROOT_MAX,
-#define        TCA_ROOT_MAX (__TCA_ROOT_MAX - 1)
-};
-
 #define TA_RTA(r)  ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct tcamsg))))
 #define TA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct tcamsg))
-/* tcamsg flags stored in attribute TCA_ROOT_FLAGS
- *
- * TCA_FLAG_LARGE_DUMP_ON user->kernel to request for larger than TCA_ACT_MAX_PRIO
- * actions in a dump. All dump responses will contain the number of actions
- * being dumped stored in for user app's consumption in TCA_ROOT_COUNT
- *
- */
-#define TCA_FLAG_LARGE_DUMP_ON         (1 << 0)
+#define TCA_ACT_TAB 1 /* attr type must be >=1 */      
+#define TCAA_MAX 1
 
 /* New extended info filters for IFLA_EXT_MASK */
 #define RTEXT_FILTER_VF                (1 << 0)