include: update headers from net-next

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

diff --git a/include/linux/bpf.h b/include/linux/bpf.h
index 49e1def7a0b859084acb77a6f21d633d33d9be16..8b3d7d3f3278683b949f8527ccbc494321f2f201 100644 (file)
--- a/include/linux/bpf.h
+++ b/include/linux/bpf.h
@@ -345,14 +345,20 @@ union bpf_attr {
  * int bpf_redirect(ifindex, flags)
  *     redirect to another netdev
  *     @ifindex: ifindex of the net device
- *     @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)
+ *     @flags:
+ *       cls_bpf:
+ *          bit 0 - if set, redirect to ingress instead of egress
+ *          other bits - reserved
+ *       xdp_bpf:
+ *         all bits - reserved
+ *     Return: cls_bpf: TC_ACT_REDIRECT on success or TC_ACT_SHOT on error
+ *            xdp_bfp: XDP_REDIRECT on success or XDP_ABORT on error
+ * int bpf_redirect_map(map, key, flags)
  *     redirect to endpoint in map
+ *     @map: pointer to dev map
  *     @key: index in map to lookup
- *     @map: fd of map to do lookup in
  *     @flags: --
+ *     Return: XDP_REDIRECT on success or XDP_ABORT on error
  *
  * u32 bpf_get_route_realm(skb)
  *     retrieve a dst's tclassid

diff --git a/include/linux/lwtunnel.h b/include/linux/lwtunnel.h
index faa6eabee2040fafcb5a2adae389642688666466..329842627162ba5270e385a8abcbe7e14f62979a 100644 (file)
--- a/include/linux/lwtunnel.h
+++ b/include/linux/lwtunnel.h
@@ -11,6 +11,7 @@ enum lwtunnel_encap_types {
        LWTUNNEL_ENCAP_IP6,
        LWTUNNEL_ENCAP_SEG6,
        LWTUNNEL_ENCAP_BPF,
+       LWTUNNEL_ENCAP_SEG6_LOCAL,
        __LWTUNNEL_ENCAP_MAX,
 };