--- zzzz-none-000/linux-4.1.38/include/uapi/linux/netfilter/nf_conntrack_common.h	2017-01-18 18:48:06.000000000 +0000
+++ bcm63-7582-715/linux-4.1.38/include/uapi/linux/netfilter/nf_conntrack_common.h	2020-11-25 10:06:48.000000000 +0000
@@ -88,9 +88,21 @@
 	IPS_UNTRACKED_BIT = 12,
 	IPS_UNTRACKED = (1 << IPS_UNTRACKED_BIT),
 
+#if defined(CONFIG_BCM_KF_BLOG) && defined(CONFIG_BLOG)
+	/* Conntrack eligible for Blogging */
+	IPS_BLOG_BIT = 13,
+	IPS_BLOG = (1 << IPS_BLOG_BIT),
+	/* Conntrack got a helper explicitly attached via CT target. */
+	IPS_HELPER_BIT = 14,	
+#else
 	/* Conntrack got a helper explicitly attached via CT target. */
 	IPS_HELPER_BIT = 13,
+#endif	
 	IPS_HELPER = (1 << IPS_HELPER_BIT),
+#if defined(CONFIG_BCM_KF_NETFILTER)
+	IPS_IQOS_BIT = 19,
+	IPS_IQOS = (1 << IPS_IQOS_BIT),
+#endif
 };
 
 /* Connection tracking event types */
@@ -107,6 +119,9 @@
 	IPCT_NATSEQADJ = IPCT_SEQADJ,
 	IPCT_SECMARK,		/* new security mark has been set */
 	IPCT_LABEL,		/* new connlabel has been set */
+#if defined(CONFIG_BCM_KF_DPI) && defined(CONFIG_BCM_DPI_MODULE)
+	IPCT_DPI,		/* dpi classification for ct is complete */
+#endif
 };
 
 enum ip_conntrack_expect_events {