From 56eaba53bc090fd61ee6f972dba5c4cf7cfa6fcb Mon Sep 17 00:00:00 2001
From: Roman Azarenko <roman.azarenko@iopsys.eu>
Date: Thu, 25 Nov 2021 10:46:33 +0100
Subject: [PATCH] Backport nfnetlink_conntrack header changes from p1
---
.../uapi/linux/netfilter/nfnetlink_conntrack.h | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/netfilter/nfnetlink_conntrack.h b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
index 6ecd43bcdd..0cb3849c4b 100644
--- a/include/uapi/linux/netfilter/nfnetlink_conntrack.h
+++ b/include/uapi/linux/netfilter/nfnetlink_conntrack.h
@@ -55,8 +55,11 @@ enum ctattr_type {
CTA_LABELS,
CTA_LABELS_MASK,
CTA_SYNPROXY,
-#if defined(CONFIG_BCM_KF_DPI)
+#if defined(CONFIG_BCM_KF_DPI) || !defined(CONFIG_BCM_IN_KERNEL)
CTA_DPI,
+#endif
+#if defined(CONFIG_BCM_KF_SGS) || !defined(CONFIG_BCM_IN_KERNEL)
+ CTA_SGS,
#endif
CTA_EXTRA_MARK,
CTA_EXTRA_MARK_MASK,
@@ -281,7 +284,7 @@ enum ctattr_expect_stats {
};
#define CTA_STATS_EXP_MAX (__CTA_STATS_EXP_MAX - 1)
-#if defined(CONFIG_BCM_KF_DPI)
+#if defined(CONFIG_BCM_KF_DPI) || !defined(CONFIG_BCM_IN_KERNEL)
enum ctattr_dpi {
CTA_DPI_UNSPEC,
CTA_DPI_APP_ID,
@@ -293,4 +296,14 @@ enum ctattr_dpi {
#define CTA_DPI_MAX (__CTA_DPI_MAX - 1)
#endif
+#if defined(CONFIG_BCM_KF_SGS) || !defined(CONFIG_BCM_IN_KERNEL)
+enum ctattr_sgs {
+ CTA_SGS_UNSPEC,
+ CTA_SGS_SES_KEY,
+ CTA_SGS_SES_PAD,
+ __CTA_SGS_MAX,
+};
+#define CTA_SGS_MAX (__CTA_SGS_MAX - 1)
+#endif
+
#endif /* _IPCONNTRACK_NETLINK_H */
--
GitLab