Skip to content
Snippets Groups Projects
Commit 56eaba53 authored by Roman Azarenko's avatar Roman Azarenko
Browse files

Backport nfnetlink_conntrack header changes from p1

parent 8f93ea5a
Branches
No related tags found
No related merge requests found
...@@ -55,8 +55,11 @@ enum ctattr_type { ...@@ -55,8 +55,11 @@ enum ctattr_type {
CTA_LABELS, CTA_LABELS,
CTA_LABELS_MASK, CTA_LABELS_MASK,
CTA_SYNPROXY, CTA_SYNPROXY,
#if defined(CONFIG_BCM_KF_DPI) #if defined(CONFIG_BCM_KF_DPI) || !defined(CONFIG_BCM_IN_KERNEL)
CTA_DPI, CTA_DPI,
#endif
#if defined(CONFIG_BCM_KF_SGS) || !defined(CONFIG_BCM_IN_KERNEL)
CTA_SGS,
#endif #endif
CTA_EXTRA_MARK, CTA_EXTRA_MARK,
CTA_EXTRA_MARK_MASK, CTA_EXTRA_MARK_MASK,
...@@ -281,7 +284,7 @@ enum ctattr_expect_stats { ...@@ -281,7 +284,7 @@ enum ctattr_expect_stats {
}; };
#define CTA_STATS_EXP_MAX (__CTA_STATS_EXP_MAX - 1) #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 { enum ctattr_dpi {
CTA_DPI_UNSPEC, CTA_DPI_UNSPEC,
CTA_DPI_APP_ID, CTA_DPI_APP_ID,
...@@ -293,4 +296,14 @@ enum ctattr_dpi { ...@@ -293,4 +296,14 @@ enum ctattr_dpi {
#define CTA_DPI_MAX (__CTA_DPI_MAX - 1) #define CTA_DPI_MAX (__CTA_DPI_MAX - 1)
#endif #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 */ #endif /* _IPCONNTRACK_NETLINK_H */
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment