Revert "Mark m_isCombinedMirrorV6Table as true for BFN (#1206)" (#1209)

prsunny · web-flow · commit 0ed2518a87ee · 2020-02-28T15:18:29.000-08:00
This reverts commit 0bf0acb.
diff --git a/orchagent/aclorch.cpp b/orchagent/aclorch.cpp
@@ -2104,13 +2104,13 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr
 
     // In Broadcom platform, V4 and V6 rules are stored in the same table
     if (platform == BRCM_PLATFORM_SUBSTRING ||
-        platform == NPS_PLATFORM_SUBSTRING  ||
-        platform == BFN_PLATFORM_SUBSTRING) {
+            platform == NPS_PLATFORM_SUBSTRING) {
         m_isCombinedMirrorV6Table = true;
     }
 
     // In Mellanox platform, V4 and V6 rules are stored in different tables
-    if (platform == MLNX_PLATFORM_SUBSTRING) {
+    if (platform == MLNX_PLATFORM_SUBSTRING ||
+        platform == BFN_PLATFORM_SUBSTRING) {
         m_isCombinedMirrorV6Table = false;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -2104,13 +2104,13 @@ void AclOrch::init(vector<TableConnector>& connectors, PortsOrch *portOrch, Mirr`
`2104`	`2104`
`2105`	`2105`	`// In Broadcom platform, V4 and V6 rules are stored in the same table`
`2106`	`2106`	`if (platform == BRCM_PLATFORM_SUBSTRING \|\|`
`2107`		`- platform == NPS_PLATFORM_SUBSTRING \|\|`
`2108`		`- platform == BFN_PLATFORM_SUBSTRING) {`
	`2107`	`+ platform == NPS_PLATFORM_SUBSTRING) {`
`2109`	`2108`	`m_isCombinedMirrorV6Table = true;`
`2110`	`2109`	`}`
`2111`	`2110`
`2112`	`2111`	`// In Mellanox platform, V4 and V6 rules are stored in different tables`
`2113`		`- if (platform == MLNX_PLATFORM_SUBSTRING) {`
	`2112`	`+ if (platform == MLNX_PLATFORM_SUBSTRING \|\|`
	`2113`	`+ platform == BFN_PLATFORM_SUBSTRING) {`
`2114`	`2114`	`m_isCombinedMirrorV6Table = false;`
`2115`	`2115`	`}`
`2116`	`2116`