The tc psp action (TCA_ID_PSP, tc_act/tc_psp.h) and the flower psp matches (TCA_FLOWER_KEY_PSP_SPI, _SPI_MASK, _VERSION, _DEV), as added by the net-next socket-less psp series. To be replaced by the regular header sync once that is merged. Signed-off-by: Todd Freed --- include/uapi/linux/pkt_cls.h | 6 ++++++ include/uapi/linux/tc_act/tc_psp.h | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 include/uapi/linux/tc_act/tc_psp.h diff --git a/include/uapi/linux/pkt_cls.h b/include/uapi/linux/pkt_cls.h index 3c24e8e2880b..b98d9aaebc31 100644 --- a/include/uapi/linux/pkt_cls.h +++ b/include/uapi/linux/pkt_cls.h @@ -139,6 +139,7 @@ enum tca_id { TCA_ID_MPLS, TCA_ID_CT, TCA_ID_GATE, + TCA_ID_PSP, /* other actions go here */ __TCA_ID_MAX = 255 }; @@ -560,6 +561,11 @@ enum { TCA_FLOWER_KEY_ENC_FLAGS, /* be32 */ TCA_FLOWER_KEY_ENC_FLAGS_MASK, /* be32 */ + TCA_FLOWER_KEY_PSP_SPI, /* be32 */ + TCA_FLOWER_KEY_PSP_SPI_MASK, /* be32 */ + TCA_FLOWER_KEY_PSP_VERSION, /* u8, enum psp_version */ + TCA_FLOWER_KEY_PSP_DEV, /* u32, PSP device ID */ + __TCA_FLOWER_MAX, }; diff --git a/include/uapi/linux/tc_act/tc_psp.h b/include/uapi/linux/tc_act/tc_psp.h new file mode 100644 index 000000000000..e58ebcae77be --- /dev/null +++ b/include/uapi/linux/tc_act/tc_psp.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ +#ifndef __LINUX_TC_PSP_H +#define __LINUX_TC_PSP_H + +#include + +#define TCA_PSP_ACT_ENCAP 1 /* attach a PSP association */ +#define TCA_PSP_ACT_DECAP 2 /* drop PSP Rx state */ + +struct tc_psp { + tc_gen; +}; + +enum { + TCA_PSP_UNSPEC, + TCA_PSP_TM, + TCA_PSP_PARMS, + TCA_PSP_PAD, + TCA_PSP_ACTION, /* u32, TCA_PSP_ACT_* */ + TCA_PSP_ASSOC_ID, /* u32, encap only: Tx association ID from + * the PSP netlink family (assoc-add) + */ + __TCA_PSP_MAX, +}; + +#define TCA_PSP_MAX (__TCA_PSP_MAX - 1) + +#endif -- 2.53.0-Meta