From d4a893801bbd041bbd55b4e33ddf8b349510b603 Mon Sep 17 00:00:00 2001 From: Bhavesh Bharadiya Date: Wed, 2 Oct 2024 12:37:50 +0530 Subject: [PATCH] PROVISORY: profiles: mxl: use ebtables for service prioritization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added ebtables priority target and ebtables extension to support service prioritization for MxL platforms. Fix for User Priority. References: PPM-3039 Signed-off-by: Bhavesh Bharadiya Signed-off-by: Petr Štetiar [cram tests] --- .gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t | 1 + .gitlab/tests/cram/urx851-b0-dk/005-build-config.t | 1 + profiles/mxl_x86.yml | 9 +++++---- profiles/mxl_x86_osp_tb341.yml | 9 +++++---- profiles/mxl_x86_osp_tb341_v2.yml | 9 +++++---- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t index 4628db5eeb..6851dac6b1 100644 --- a/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t +++ b/.gitlab/tests/cram/mxl25641-hdk-6/005-build-config.t @@ -259,6 +259,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_kmod-dnsresolver=y CONFIG_PACKAGE_kmod-dp-eth-reinsert=y CONFIG_PACKAGE_kmod-dpl=y + CONFIG_PACKAGE_kmod-ebt-prio=y CONFIG_PACKAGE_kmod-ebtables=y CONFIG_PACKAGE_kmod-ebtables-ipv4=y CONFIG_PACKAGE_kmod-ebtables-ipv6=y diff --git a/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t b/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t index 3bb802e5f1..cffaeebf95 100644 --- a/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t +++ b/.gitlab/tests/cram/urx851-b0-dk/005-build-config.t @@ -259,6 +259,7 @@ Assure expected build configuration (PCF-1413): CONFIG_PACKAGE_kmod-dnsresolver=y CONFIG_PACKAGE_kmod-dp-eth-reinsert=y CONFIG_PACKAGE_kmod-dpl=y + CONFIG_PACKAGE_kmod-ebt-prio=y CONFIG_PACKAGE_kmod-ebtables=y CONFIG_PACKAGE_kmod-ebtables-ipv4=y CONFIG_PACKAGE_kmod-ebtables-ipv6=y diff --git a/profiles/mxl_x86.yml b/profiles/mxl_x86.yml index 3b112fae60..0c17577173 100644 --- a/profiles/mxl_x86.yml +++ b/profiles/mxl_x86.yml @@ -13,7 +13,7 @@ feeds: - name: intel_x86 uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_target_x86.git tracking_branch: updk_9.1.60 - revision: 8e2ad0118b6dfdb1c8d1ff8cbc8586dc32cc1eee + revision: b4830a55e173404589cb313278011d3bb5aae373 - name: rootfs uri: ssh://git@git.maxlinear.com/ugw/rootfs.git tracking_branch: updk_9.1.60 @@ -32,8 +32,8 @@ feeds: revision: 7f53bcc7d43c8fe41417d21d50e290bb77f6c231 - name: gwdpa_dpm uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_gwdpa-dpm.git - tracking_branch: master - revision: f0f5f96f7f75135359ab180898e676c3ad0b76e4 + tracking_branch: updk_9.1.60.2 + revision: ec0e6087e4aafd3bf0a32a2dd99b09be26dfaa13 - name: misc uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_common.git tracking_branch: master @@ -41,7 +41,7 @@ feeds: - name: opensource_apps_prpl uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_opensource_apps_prpl.git tracking_branch: updk_9.1.60_openwrt_23.05 - revision: 89e5b505fc160a59598e9041faff9984279b0231 + revision: aadcdfce9702c793a2810b6d1f94725795f376c8 - name: packet_learn uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_packet_learn.git tracking_branch: master @@ -151,6 +151,7 @@ packages: - kmod-pon-mcc-drv - kmod-pon-mcc-drv-filter - kmod-mxl_pon_hgu_vuni_lgm + - kmod-ebt-prio - ethtool - base-files-prpl - ppmd diff --git a/profiles/mxl_x86_osp_tb341.yml b/profiles/mxl_x86_osp_tb341.yml index a1d18effd1..07165fcd81 100644 --- a/profiles/mxl_x86_osp_tb341.yml +++ b/profiles/mxl_x86_osp_tb341.yml @@ -13,7 +13,7 @@ feeds: - name: intel_x86 uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_target_x86.git tracking_branch: updk_9.1.60 - revision: 8e2ad0118b6dfdb1c8d1ff8cbc8586dc32cc1eee + revision: b4830a55e173404589cb313278011d3bb5aae373 - name: rootfs uri: ssh://git@git.maxlinear.com/ugw/rootfs.git tracking_branch: updk_9.1.60 @@ -32,8 +32,8 @@ feeds: revision: 7f53bcc7d43c8fe41417d21d50e290bb77f6c231 - name: gwdpa_dpm uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_gwdpa-dpm.git - tracking_branch: master - revision: f0f5f96f7f75135359ab180898e676c3ad0b76e4 + tracking_branch: updk_9.1.60.2 + revision: ec0e6087e4aafd3bf0a32a2dd99b09be26dfaa13 - name: misc uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_common.git tracking_branch: master @@ -41,7 +41,7 @@ feeds: - name: opensource_apps_prpl uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_opensource_apps_prpl.git tracking_branch: updk_9.1.60_openwrt_23.05 - revision: 89e5b505fc160a59598e9041faff9984279b0231 + revision: aadcdfce9702c793a2810b6d1f94725795f376c8 - name: packet_learn uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_packet_learn.git tracking_branch: master @@ -147,6 +147,7 @@ packages: - kmod-pon-mcc-drv - kmod-pon-mcc-drv-filter - kmod-mxl_pon_hgu_vuni_lgm + - kmod-ebt-prio - ethtool - base-files-prpl - ppmd diff --git a/profiles/mxl_x86_osp_tb341_v2.yml b/profiles/mxl_x86_osp_tb341_v2.yml index 8609c57bed..31206d7257 100644 --- a/profiles/mxl_x86_osp_tb341_v2.yml +++ b/profiles/mxl_x86_osp_tb341_v2.yml @@ -13,7 +13,7 @@ feeds: - name: intel_x86 uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_target_x86.git tracking_branch: updk_9.1.60 - revision: 8feeb48b8cab59f168a4afb159b1334f638e4877 + revision: b4830a55e173404589cb313278011d3bb5aae373 - name: rootfs uri: ssh://git@git.maxlinear.com/ugw/rootfs.git tracking_branch: updk_9.1.65 @@ -32,8 +32,8 @@ feeds: revision: 7f53bcc7d43c8fe41417d21d50e290bb77f6c231 - name: gwdpa_dpm uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_gwdpa-dpm.git - tracking_branch: master - revision: f0f5f96f7f75135359ab180898e676c3ad0b76e4 + tracking_branch: updk_9.1.60.2 + revision: ec0e6087e4aafd3bf0a32a2dd99b09be26dfaa13 - name: misc uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_common.git tracking_branch: master @@ -41,7 +41,7 @@ feeds: - name: opensource_apps_prpl uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_opensource_apps_prpl.git tracking_branch: updk_9.1.60_openwrt_23.05 - revision: 89e5b505fc160a59598e9041faff9984279b0231 + revision: aadcdfce9702c793a2810b6d1f94725795f376c8 - name: packet_learn uri: ssh://git@git.maxlinear.com/ugw/feeds/feed_packet_learn.git tracking_branch: master @@ -147,6 +147,7 @@ packages: - kmod-pon-mcc-drv - kmod-pon-mcc-drv-filter - kmod-mxl_pon_hgu_vuni_lgm + - kmod-ebt-prio - ethtool - base-files-prpl - ppmd