Deleted enable dropmon condition and moved patch

Signed-off-by: Vadym Hlushko <[email protected]>
sonic-net · Apr 8, 2022 · c8b5376 · c8b5376
1 parent c908c3d
commit c8b5376
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -99,11 +99,6 @@ $(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
 	stg repair
 	stg import -s ../patch/series
 
-	if [[ $(ENABLE_SFLOW_DROPMON) == y ]]; then
-		stg repair
-		stg import -s ../patch/dropmon/series
-	fi
-
 	# Optionally add/remove kernel options
 	if [ -f ../manage-config ]; then
 		../manage-config $(CONFIGURED_ARCH) $(CONFIGURED_PLATFORM)

diff --git a/...-Psample-new-attr-tc-tc-occ-latency.patch → ...-Psample-new-attr-tc-tc-occ-latency.patch b/...-Psample-new-attr-tc-tc-occ-latency.patch → ...-Psample-new-attr-tc-tc-occ-latency.patch
diff --git a/patch/dropmon/series b/patch/dropmon/series
diff --git a/patch/series b/patch/series
@@ -131,6 +131,8 @@ kernel-compat-always-include-linux-compat.h-from-net-compat.patch
 
 0001-net-prefer-socket-bound-to-interface-when-not-in-VRF.patch
 
+0001-Psample-new-attr-tc-tc-occ-latency.patch
+
 # Cisco patches for 5.10 kernel
 cisco-mtd-part.patch
 cisco-mdio-mux-support-acpi.patch