[rdkb][common][app][Fix owe patch error]
[Description]
RDKB add owe definition at commit RDKB-37530, so we need to remove our owe patch.
And use filogic feature to patch halinterface if the platform is colgin or airoha.
[Release-log]
N/A
Change-Id: I181c67eb11f7deca712ed5ea3b32ee41f22483ce
diff --git a/recipes-wifi/hal/files/0001-Add-owe-mode.patch b/recipes-wifi/hal/files/0001-Add-owe-mode.patch
index cdea238..d6a0b7d 100644
--- a/recipes-wifi/hal/files/0001-Add-owe-mode.patch
+++ b/recipes-wifi/hal/files/0001-Add-owe-mode.patch
@@ -17,7 +17,7 @@
wifi_security_mode_wpa3_transition = 0x00000400,
- wifi_security_mode_wpa3_enterprise = 0x00000800
+ wifi_security_mode_wpa3_enterprise = 0x00000800,
-+ wifi_security_mode_owe = 0x00001000
++ wifi_security_mode_enhanced_open = 0x00001000
} wifi_security_modes_t;
typedef struct {
diff --git a/recipes-wifi/hal/halinterface.bbappend b/recipes-wifi/hal/halinterface.bbappend
index 4523aa9..f5424b2 100644
--- a/recipes-wifi/hal/halinterface.bbappend
+++ b/recipes-wifi/hal/halinterface.bbappend
@@ -8,7 +8,9 @@
if [ ! -e patch_applied ]; then
patch -p1 < ${WORKDIR}/sta-network.patch
patch -p1 < ${WORKDIR}/add_undefined_dfs_function.patch
- patch -p1 < ${WORKDIR}/0001-Add-owe-mode.patch
+ if ${@bb.utils.contains( 'DISTRO_FEATURES', 'filogic', 'false', 'true', d)}; then
+ patch -p1 < ${WORKDIR}/0001-Add-owe-mode.patch
+ fi
patch -p1 < ${WORKDIR}/0002-Add-EHT-support.patch
touch patch_applied
fi
diff --git a/recipes-wifi/wifi-test-tool/files/src/wifi-test-tool.c b/recipes-wifi/wifi-test-tool/files/src/wifi-test-tool.c
index df1f102..2c79075 100644
--- a/recipes-wifi/wifi-test-tool/files/src/wifi-test-tool.c
+++ b/recipes-wifi/wifi-test-tool/files/src/wifi-test-tool.c
@@ -268,7 +268,7 @@
}else if(strcmp(encryption_mode, "sae-mixed") == 0){
intf_param->security.mode = wifi_security_mode_wpa3_transition;
}else if(strcmp(encryption_mode, "owe") == 0){
- intf_param->security.mode = wifi_security_mode_owe;
+ intf_param->security.mode = wifi_security_mode_enhanced_open;
}
if(strstr(encryption_mode, "tkip") && (strstr(encryption_mode, "ccmp") || strstr(encryption_mode, "aes") )){
@@ -493,7 +493,7 @@
// interface
if (strlen(ap_param.ifname) != 0) {
strncpy(vap_info.vap_name, ap_param.ifname, 16);
- vap_info.vap_name[15] = "\0";
+ vap_info.vap_name[15] = '\0';
}
// Security
@@ -604,7 +604,7 @@
strcpy(key_mgmt, "NONE");
else if (sta_param.security.mode == wifi_security_mode_wpa3_personal)
strcpy(key_mgmt, "SAE");
- else if (sta_param.security.mode == wifi_security_mode_owe)
+ else if (sta_param.security.mode == wifi_security_mode_enhanced_open)
strcpy(key_mgmt, "OWE");
else
strcpy(key_mgmt, "WPA-PSK");