Initial patch from SPF11.3.CSU1 to SPF11.4.CS
This is the result of applying the diff from SPF11.3.CSU1
(r11.3_00005.2) and SPF11.4.CS (r11.4_00001.2).
The rejects will be fixed in later commits
Change-Id: I22d92814b0ea617e4cb693eafa40f208081d729f
diff --git a/ecm_classifier.h b/ecm_classifier.h
index a4ffcf7..e9137ca 100644
--- a/ecm_classifier.h
+++ b/ecm_classifier.h
@@ -1,6 +1,6 @@
/*
**************************************************************************
- * Copyright (c) 2014-2015, 2018-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2015, 2018-2021 The Linux Foundation. All rights reserved.
* Permission to use, copy, modify, and/or distribute this software for
* any purpose with or without fee is hereby granted, provided that the
* above copyright notice and this permission notice appear in all copies.
@@ -106,6 +106,10 @@
#define ECM_CLASSIFIER_PROCESS_ACTION_TIMER_GROUP_NO_TOUCH 0x00000400 /* Do not update CI time */
+#ifdef ECM_CLASSIFIER_PCC_ENABLE
+#define ECM_CLASSIFIER_PROCESS_ACTION_MIRROR_ENABLED 0x00000800 /* Contains mirror dynamic interface number */
+#endif
+
/*
* struct ecm_classifier_process_response
* Response structure returned by a process call
@@ -138,6 +142,10 @@
uint32_t egress_mc_vlan_tag[ECM_DB_MULTICAST_IF_MAX][2]; /* Multicast egress VLAN tags */
#endif
#endif
+#ifdef ECM_CLASSIFIER_PCC_ENABLE
+ int flow_mirror_ifindex; /* Flow mirror device index value */
+ int return_mirror_ifindex; /* Return mirror device index value */
+#endif
ecm_classifier_acceleration_mode_t accel_mode; /* Acceleration needed for this connection */
ecm_db_timer_group_t timer_group; /* Timer group the connection should be in */
};
@@ -162,7 +170,9 @@
* the underlying accelaration engine.
*/
struct ecm_classifier_rule_create {
-
+#ifdef ECM_CLASSIFIER_EMESH_ENABLE
+ struct sk_buff *skb;
+#endif
};
/*