diff --git a/.gitlab/cdrouter.yml b/.gitlab/cdrouter.yml index 6ff4988476..ec5373766c 100644 --- a/.gitlab/cdrouter.yml +++ b/.gitlab/cdrouter.yml @@ -11,6 +11,7 @@ - when: manual variables: CDROUTER_CONFIG_WIFI_BEACON_PHY: 'ax b g n' + CDROUTER_CONFIG_WIFI_BEACON_RSN_CIPHER: 'CCMP-128' CDROUTER_CONFIG_WIFI_LAN_CHANNEL: 6 CDROUTER_CONFIG_WIFI_LAN_SSID: 'prplOS' CDROUTER_TEST_CONFIG: generic diff --git a/.gitlab/cdrouter/mxl25641-hdk-6.yml b/.gitlab/cdrouter/mxl25641-hdk-6.yml index cec82c4fa6..17f16f3097 100644 --- a/.gitlab/cdrouter/mxl25641-hdk-6.yml +++ b/.gitlab/cdrouter/mxl25641-hdk-6.yml @@ -37,6 +37,7 @@ CDRouter-Wireless MXL25641-HDK-6 eMMC: variables: CDROUTER_TEST_CONFIG: wireless CDROUTER_CONFIG_WIFI_BEACON_PHY: 'ax b g n' + CDROUTER_CONFIG_WIFI_BEACON_RSN_CIPHER: 'CCMP-128 GCMP-256' DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh diff --git a/.gitlab/cdrouter/wnc-freedom.yml b/.gitlab/cdrouter/wnc-freedom.yml index c81fca75bf..2971b9e504 100644 --- a/.gitlab/cdrouter/wnc-freedom.yml +++ b/.gitlab/cdrouter/wnc-freedom.yml @@ -37,6 +37,7 @@ CDRouter-Wireless Freedom initramfs: variables: CDROUTER_TEST_CONFIG: wireless CDROUTER_CONFIG_WIFI_BEACON_PHY: 'ax b be g n' + CDROUTER_CONFIG_WIFI_BEACON_RSN_CIPHER: 'CCMP-128 GCMP-256' DUT_INIT_SCRIPTS: | .gitlab/scripts/dut-init/cdrouter-dut-flush-dns-relay-cache.sh .gitlab/scripts/dut-init/cdrouter-dut-configure-wireless.sh diff --git a/.gitlab/tests/cram/generic/obuspa.t b/.gitlab/tests/cram/generic/obuspa.t index e644e31270..716b5ca4c0 100644 --- a/.gitlab/tests/cram/generic/obuspa.t +++ b/.gitlab/tests/cram/generic/obuspa.t @@ -2951,6 +2951,11 @@ Check that obuspa has expected datamodel available (minus the platform specific Device.WiFi.AccessPoint.{i}.MBOAssocDisallowReason proto::wld Device.WiFi.AccessPoint.{i}.MBOEnable proto::wld Device.WiFi.AccessPoint.{i}.MCEnable proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig. proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig.EMLMREnable proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig.EMLSREnable proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig.NSTREnable proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig.STREnable proto::wld Device.WiFi.AccessPoint.{i}.MLOStats. proto::wld Device.WiFi.AccessPoint.{i}.MLOStats.BroadcastBytesReceived proto::wld Device.WiFi.AccessPoint.{i}.MLOStats.BroadcastBytesSent proto::wld @@ -3376,9 +3381,6 @@ Check that obuspa has expected datamodel available (minus the platform specific Device.WiFi.Radio.{i}.IEEE80211ax.SRGOBSSPDMaxOffset proto::wld Device.WiFi.Radio.{i}.IEEE80211ax.SRGOBSSPDMinOffset proto::wld Device.WiFi.Radio.{i}.IEEE80211ax.SRGPartialBSSIDBitmap proto::wld - Device.WiFi.Radio.{i}.IEEE80211be. proto::wld - Device.WiFi.Radio.{i}.IEEE80211be.EMLMREnable proto::wld - Device.WiFi.Radio.{i}.IEEE80211be.EMLSREnable proto::wld Device.WiFi.Radio.{i}.IEEE80211hEnabled proto::wld Device.WiFi.Radio.{i}.IEEE80211hSupported proto::wld Device.WiFi.Radio.{i}.IEEE80211kSupported proto::wld @@ -6817,6 +6819,11 @@ Check that obuspa provides the same datamodel again (minus the platform specific Device.WiFi.AccessPoint.{i}.MBOAssocDisallowReason proto::wld Device.WiFi.AccessPoint.{i}.MBOEnable proto::wld Device.WiFi.AccessPoint.{i}.MCEnable proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig. proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig.EMLMREnable proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig.EMLSREnable proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig.NSTREnable proto::wld + Device.WiFi.AccessPoint.{i}.MLDConfig.STREnable proto::wld Device.WiFi.AccessPoint.{i}.MLOStats. proto::wld Device.WiFi.AccessPoint.{i}.MLOStats.BroadcastBytesReceived proto::wld Device.WiFi.AccessPoint.{i}.MLOStats.BroadcastBytesSent proto::wld @@ -7242,9 +7249,6 @@ Check that obuspa provides the same datamodel again (minus the platform specific Device.WiFi.Radio.{i}.IEEE80211ax.SRGOBSSPDMaxOffset proto::wld Device.WiFi.Radio.{i}.IEEE80211ax.SRGOBSSPDMinOffset proto::wld Device.WiFi.Radio.{i}.IEEE80211ax.SRGPartialBSSIDBitmap proto::wld - Device.WiFi.Radio.{i}.IEEE80211be. proto::wld - Device.WiFi.Radio.{i}.IEEE80211be.EMLMREnable proto::wld - Device.WiFi.Radio.{i}.IEEE80211be.EMLSREnable proto::wld Device.WiFi.Radio.{i}.IEEE80211hEnabled proto::wld Device.WiFi.Radio.{i}.IEEE80211hSupported proto::wld Device.WiFi.Radio.{i}.IEEE80211kSupported proto::wld diff --git a/.testbed/cdrouter/configurations/wireless b/.testbed/cdrouter/configurations/wireless index 5872cc5684..698aa58a93 100644 --- a/.testbed/cdrouter/configurations/wireless +++ b/.testbed/cdrouter/configurations/wireless @@ -449,7 +449,7 @@ SECTION "Base Configuration" { testvar wifiBeaconWpaMode RSN testvar wifiBeaconWpaKeyMgmt "PSK SAE" # testvar wifiBeaconWpaCipher CCMP-128 - # testvar wifiBeaconRsnCipher CCMP-128 + testvar wifiBeaconRsnCipher "@CDROUTER_CONFIG_WIFI_BEACON_RSN_CIPHER@" # testvar wifiBeaconWpaGroupCipher CCMP-128 testvar wifiBeaconPhy "@CDROUTER_CONFIG_WIFI_BEACON_PHY@" diff --git a/profiles/prpl.yml b/profiles/prpl.yml index 128530db65..aab86571cd 100644 --- a/profiles/prpl.yml +++ b/profiles/prpl.yml @@ -11,7 +11,7 @@ feeds: - name: feed_prplmesh uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplmesh.git - revision: main@c0c8f7239bc5a0d9e0b97abffc016d2777059383 + revision: main@0ec1958f00c3116f5c4777d65f6c7936c5b687bf - name: feed_prplos uri: https://gitlab.com/prpl-foundation/prplos/feeds/feed-prplos.git