aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ahern <dsahern@kernel.org>2023-06-21 09:13:05 -0700
committerDavid Ahern <dsahern@kernel.org>2023-06-21 09:13:05 -0700
commit3c37c2d662aa6a831dfa3b161cae40ca55c8db68 (patch)
tree0157ae94d94ac123613342ecfcb192bbb93aa8bb
parent559ffd9e21bf6d29d704cea3dbe38fbaac310f43 (diff)
downloadiproute2-3c37c2d662aa6a831dfa3b161cae40ca55c8db68.tar.gz
Update kernel headers
Update kernel headers to commit: cc7554954848 ("net: micrel: Change to receive timestamp in the frame for lan8841") Signed-off-by: David Ahern <dsahern@kernel.org>
-rw-r--r--include/uapi/linux/bpf.h1
-rw-r--r--include/uapi/linux/pkt_cls.h9
2 files changed, 10 insertions, 0 deletions
diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 2828b4206..1ff326ddc 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -1035,6 +1035,7 @@ enum bpf_attach_type {
BPF_TRACE_KPROBE_MULTI,
BPF_LSM_CGROUP,
BPF_STRUCT_OPS,
+ BPF_NETFILTER,
__MAX_BPF_ATTACH_TYPE
};
diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h
index 00933dda7..7865f5a98 100644
--- a/include/uapi/linux/pkt_cls.h
+++ b/include/uapi/linux/pkt_cls.h
@@ -596,6 +596,8 @@ enum {
TCA_FLOWER_L2_MISS, /* u8 */
+ TCA_FLOWER_KEY_CFM, /* nested */
+
__TCA_FLOWER_MAX,
};
@@ -704,6 +706,13 @@ enum {
TCA_FLOWER_KEY_FLAGS_FRAG_IS_FIRST = (1 << 1),
};
+enum {
+ TCA_FLOWER_KEY_CFM_OPT_UNSPEC,
+ TCA_FLOWER_KEY_CFM_MD_LEVEL,
+ TCA_FLOWER_KEY_CFM_OPCODE,
+ TCA_FLOWER_KEY_CFM_OPT_MAX,
+};
+
#define TCA_FLOWER_MASK_FLAGS_RANGE (1 << 0) /* Range-based match */
/* Match-all classifier */