Merge branch 'master' of https://gitee.com/rain_myf/third_party_wpa_supplicant

bundle.json

+{
+    "name": "@ohos/wpa_supplicant",
+    "description": "wpa_supplicant is a WPA Supplicant for Linux, BSD, Mac OS X, and Windows with support for WPA and WPA2 (IEEE 802.11i / RSN). It is suitable for both desktop/laptop computers and embedded systems. Supplicant is the IEEE 802.1X/WPA component that is used in the client stations. It implements key negotiation with a WPA Authenticator and it controls the roaming and IEEE 802.11 authentication/association of the wlan driver.",
+    "version": "3.1",
+    "license": "BSD 3-Clause",
+    "publishAs": "code-segment",
+    "segment": {
+        "destPath": "third_party/wpa_supplicant"
+    },
+    "dirs": {},
+    "scripts": {},
+    "licensePath": "wpa_supplicant-2.9_standard/COPYING",
+    "readmePath": {
+        "en": "wpa_supplicant-2.9_standard/README"
+    },
+    "component": {
+        "name": "thirdparty_wpa_supplicant",
+        "subsystem": "",
+        "syscap": [],
+        "features": [],
+        "adapted_system_type": [],
+        "rom": "",
+        "ram": "",
+        "deps": {
+            "components": [],
+            "third_party": []
+        },
+        "build": {
+            "sub_component": [],
+            "inner_kits": [],
+            "test": []
+        }
+    }
+}
\ No newline at end of file

wpa_supplicant-2.9/BUILD.gn

@@ -14,16 +14,10 @@ build_ext_component("wpa_supplicant-2.9") {
   arch_cflags += " --target=$target_triple"
   command = "sh build.sh ${outdir} ${ohos_build_compiler} ${ohos_build_ndk} ${ohos_build_type} ${clang_dir} ${ohos_kernel_type} ${sysroot_path} \"${arch_cflags}\""
   exec_path = rebase_path(".", root_build_dir)
-  deps = [
-    "//drivers/adapter/uhdf/manager:hdf_core",
-    "//drivers/peripheral/wlan/client:hdi_wifi",
-  ]
+  deps = [ "//drivers/peripheral/wlan/client:wifi_driver_client" ]
 }
 
 lite_component("wpa_supplicant") {
-  deps = [
-    ":wpa_supplicant-2.9",
-    "//drivers/adapter/uhdf/manager:hdf_core",
-  ]
+  deps = [ ":wpa_supplicant-2.9" ]
   features = []
 }

wpa_supplicant-2.9/build/Makefile

@@ -11,7 +11,7 @@ endif
 
 ifeq ($(COMPILER_TYPE), clang)
 SYSROOT_PATH ?= ../../../../prebuilts/lite/sysroot
-ARCH_CFLAGS ?= --target=arm-liteos -march=armv7-a -mfloat-abi=softfp
+ARCH_CFLAGS ?= --target=arm-liteos-ohos -march=armv7-a -mfloat-abi=softfp
 CC := $(COMPILER_DIR)/bin/clang
 AR := $(COMPILER_DIR)/bin/llvm-ar
 CFLAGS += --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS)
@@ -24,8 +24,8 @@ endif
 #TEST_AP = testap
 #TEST_WPA = testwpa
 
-WPA_LDFLAGS = -L$(DEPDIR) -lhdf_core -lhdf_osal -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client
-TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR) -lhdf_core -lhdf_osal -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client
+WPA_LDFLAGS = -L$(DEPDIR) -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client
+TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR) -lsec_shared -lrt -lm -lpthread -lhilog_shared -lwifi_driver_client
 
 WPA_SHARED = libwpa.so
 WPA_STATIC = libwpa.a

wpa_supplicant-2.9/hostapd/Makefile

@@ -45,14 +45,13 @@ CFLAGS += -I$(abspath ../../../../third_party/bounds_checking_function/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/ability/sbuf/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/include/core)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core//adapter/syscall/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf/posix/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/shared/include)
 CFLAGS += -I$(abspath ../../../../drivers/peripheral/wlan/client/include)
 CFLAGS += -I$(abspath ../build/include)
 CFLAGS += -shared -fPIC
 CFLAGS += -fstack-protector-all
 CFLAGS += -DUSERSPACE_CLIENT_SUPPORT
-LIBS += -L$(DEPDIR) -lhdf_core -lhdf_osal -lsec_shared -lhilog_shared -lwifi_driver_client
+LIBS += -L$(DEPDIR) -lsec_shared -lhilog_shared -lwifi_driver_client
 
 export BINDIR ?= /usr/local/bin/
 
@@ -60,7 +59,7 @@ export BINDIR ?= /usr/local/bin/
 
 ifeq ($(COMPILER_TYPE), clang)
 SYSROOT_PATH ?= ../../../../prebuilts/lite/sysroot
-ARCH_CFLAGS ?= --target=arm-liteos -march=armv7-a -mfloat-abi=softfp
+ARCH_CFLAGS ?= --target=arm-liteos-ohos -march=armv7-a -mfloat-abi=softfp
 CC := $(COMPILER_DIR)/bin/clang
 CFLAGS += --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS)
 LDFLAGS += --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS)

wpa_supplicant-2.9/src/drivers/wpa_hal.c

@@ -1036,9 +1036,11 @@ static void WifiWpaHwFeatureDataFree(struct hostapd_hw_modes **modes, uint16_t n
 
 static struct hostapd_hw_modes *WifiWpaGetHwFeatureData(void *priv, uint16_t *numModes, uint16_t *flags, uint8_t *dfs)
 {
-    WifiModes modesData[] = {{12, HOSTAPD_MODE_IEEE80211G}, {4, HOSTAPD_MODE_IEEE80211B}};
+    WifiModes modesData[] = {{IEEE80211G_RATES_NUM, HOSTAPD_MODE_IEEE80211G},
+        {IEEE80211B_RATES_NUM, HOSTAPD_MODE_IEEE80211B}, {IEEE80211A_RATES_NUM, HOSTAPD_MODE_IEEE80211A}};
     size_t loop;
     uint32_t index;
+    uint32_t iee80211band;
     WifiHwFeatureData hwFeatureData;
     WifiDriverData *drv = (WifiDriverData *)priv;
     (void)dfs;
@@ -1052,7 +1054,9 @@ static struct hostapd_hw_modes *WifiWpaGetHwFeatureData(void *priv, uint16_t *nu
     if (WifiCmdGetHwFeature(drv->iface, &hwFeatureData) != SUCC) {
         return NULL;
     }
-
+    if (hwFeatureData.bands[IEEE80211_BAND_5GHZ].channelNum != 0) {
+        *numModes = sizeof(modesData) / sizeof(WifiModes);
+    }
     struct hostapd_hw_modes *modes = os_calloc(*numModes, sizeof(struct hostapd_hw_modes));
     if (modes == NULL) {
         return NULL;
@@ -1064,25 +1068,34 @@ static struct hostapd_hw_modes *WifiWpaGetHwFeatureData(void *priv, uint16_t *nu
     }
 
     modes[0].ht_capab = hwFeatureData.htCapab;
-    for (index = 0; index < sizeof(modesData) / sizeof(WifiModes); index++) {
+    iee80211band = IEEE80211_BAND_2GHZ;
+    for (index = 0; index < *numModes; index++) {
+        if (index >= DEFAULT_NUM_MODES) {
+            iee80211band = IEEE80211_BAND_5GHZ;
+        }
         modes[index].mode = modesData[index].mode;
-        modes[index].num_channels = hwFeatureData.channelNum;
+        modes[index].num_channels = hwFeatureData.bands[iee80211band].channelNum;
         modes[index].num_rates = modesData[index].numRates;
-        modes[index].channels = os_calloc(hwFeatureData.channelNum, sizeof(struct hostapd_channel_data));
+        modes[index].channels = os_calloc(hwFeatureData.bands[iee80211band].channelNum, sizeof(struct hostapd_channel_data));
         modes[index].rates = os_calloc(modes[index].num_rates, sizeof(uint32_t));
         if ((modes[index].channels == NULL) || (modes[index].rates == NULL)) {
             WifiWpaHwFeatureDataFree(&modes, *numModes);
             return NULL;
         }
 
-        for (loop = 0; loop < (size_t)hwFeatureData.channelNum; loop++) {
-            modes[index].channels[loop].chan = hwFeatureData.iee80211Channel[loop].channel;
-            modes[index].channels[loop].freq = hwFeatureData.iee80211Channel[loop].freq;
-            modes[index].channels[loop].flag = hwFeatureData.iee80211Channel[loop].flags;
+        for (loop = 0; loop < (size_t)hwFeatureData.bands[iee80211band].channelNum; loop++) {
+            modes[index].channels[loop].chan = hwFeatureData.bands[iee80211band].iee80211Channel[loop].channel;
+            modes[index].channels[loop].freq = hwFeatureData.bands[iee80211band].iee80211Channel[loop].freq;
+            modes[index].channels[loop].flag = hwFeatureData.bands[iee80211band].iee80211Channel[loop].flags;
         }
 
-        for (loop = 0; loop < (size_t)modes[index].num_rates; loop++)
-            modes[index].rates[loop] = hwFeatureData.bitrate[loop];
+        for (loop = 0; loop < (size_t)modes[index].num_rates; loop++) {
+            if (index < DEFAULT_NUM_MODES) {
+                modes[index].rates[loop] = hwFeatureData.bitrate[loop];
+            } else {
+                modes[index].rates[loop] = hwFeatureData.bitrate[loop + IEEE80211B_RATES_NUM];
+            }
+        }
     }
 
     wpa_printf(MSG_INFO, "WifiWpaGetHwFeatureData done");
@@ -1370,6 +1383,23 @@ static void WifiSetApFreq(WifiApSetting *apsettings, const struct wpa_driver_ap_
     }
 }
 
+static void WifiSetApBand(WifiApSetting *apsettings, struct hostapd_data *hapd)
+{
+    if ((apsettings!= NULL) && (hapd!= NULL)) {
+        switch (hapd->conf->wps_rf_bands) {
+            case WPS_RF_24GHZ:
+                apsettings->freqParams.band = IEEE80211_BAND_2GHZ;
+                break;
+            case WPS_RF_50GHZ:
+                apsettings->freqParams.band = IEEE80211_BAND_5GHZ;
+                break;
+            default:
+                apsettings->freqParams.band = IEEE80211_BAND_2GHZ;
+                break;
+        }
+    }
+}
+
 static int WifiSetApBeaconData(WifiApSetting *apsettings, const struct wpa_driver_ap_params *params)
 {
     if ((params->head != NULL) && (params->head_len != 0)) {
@@ -1472,6 +1502,7 @@ static int32_t WifiWpaSetAp(void *priv, struct wpa_driver_ap_params *params)
         }
     }
     WifiSetApFreq(apsettings, params);
+    WifiSetApBand(apsettings, drv->hapd);
     if (WifiSetApBeaconData(apsettings, params) != SUCC) {
         goto failed;
     }

wpa_supplicant-2.9/src/drivers/wpa_hal_event.c

@@ -10,7 +10,6 @@
 #include "utils/common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "utils/hdf_base.h"
 #include "l2_packet/l2_packet.h"
 #include "wpa_hal.h"
 #include "wpa_supplicant_i.h"

wpa_supplicant-2.9/wpa_supplicant/Makefile

@@ -57,19 +57,18 @@ CFLAGS += -I$(abspath ../../../../drivers/framework/ability/sbuf/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/shared/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/include/core)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/adapter/syscall/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf/posix/include)
 CFLAGS += -I$(abspath ../../../../third_party/bounds_checking_function/include)
 CFLAGS += -I$(abspath ../../../../drivers/peripheral/wlan/client/include)
 CFLAGS += -I$(abspath ../build/include)
 CFLAGS += -shared -fPIC
 CFLAGS += -DUSERSPACE_CLIENT_SUPPORT
 CFLAGS += -fstack-protector-all
-LIBS += -L$(DEPDIR) -lhdf_core -lhdf_osal -lsec_shared -lhilog_shared -lwifi_driver_client
+LIBS += -L$(DEPDIR) -lsec_shared -lhilog_shared -lwifi_driver_client
 -include .config
 
 ifeq ($(COMPILER_TYPE), clang)
 SYSROOT_PATH ?= ../../../../prebuilts/lite/sysroot
-ARCH_CFLAGS ?= --target=arm-liteos -march=armv7-a -mfloat-abi=softfp
+ARCH_CFLAGS ?= --target=arm-liteos-ohos -march=armv7-a -mfloat-abi=softfp
 CC := $(COMPILER_DIR)/bin/clang
 CFLAGS += --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS)
 LDFLAGS += --sysroot=$(SYSROOT_PATH) $(ARCH_CFLAGS)

wpa_supplicant-2.9_standard/BUILD.gn

@@ -49,8 +49,6 @@ ohos_shared_library("wpa_client") {
     "$FWK_ROOT_DIR/core/shared/include",
     "$FWK_ROOT_DIR/include/core",
     "$FWK_ROOT_DIR/core/adapter/syscall/include",
-    "//drivers/adapter/uhdf/posix/include",
-    "//drivers/adapter/uhdf2/osal/include",
     "//drivers/peripheral/wlan/client/include",
     "//third_party/bounds_checking_function/include",
   ]
@@ -245,8 +243,6 @@ ohos_shared_library("wpa") {
     "$FWK_ROOT_DIR/core/shared/include",
     "$FWK_ROOT_DIR/include/core",
     "$FWK_ROOT_DIR/core/adapter/syscall/include",
-    "//drivers/adapter/uhdf/posix/include",
-    "//drivers/adapter/uhdf2/osal/include",
     "//drivers/peripheral/wlan/client/include",
     "//third_party/bounds_checking_function/include",
   ]
@@ -292,7 +288,6 @@ ohos_shared_library("wpa") {
 
   deps = [
     "//drivers/adapter/uhdf2/manager:hdf_devmgr",
-    "//drivers/adapter/uhdf2/utils:libhdf_utils",
     "//drivers/peripheral/wlan/client:wifi_driver_client",
     "//third_party/bounds_checking_function:libsec_static",
   ]

wpa_supplicant-2.9_standard/build/Makefile

@@ -39,8 +39,8 @@ DEPDIR_WIFIDRIVERCLIENT = $(abspath ../../../../out/ohos-arm-release/common/comm
 DEPDIR_HDFUTILS = $(abspath ../../../../out/ohos-arm-release/hdf/hdf)
 DEPDIR_HILOG = $(abspath ../../../../out/ohos-arm-release/hiviewdfx/hilog/)
 DEPDIR_SEC = $(abspath ../../../../device/hisilicon/hispark_taurus/sdk_linux/soc/lib/)
-WPA_LDFLAGS = -L$(DEPDIR_HDFUTILS) -lhdf_utils.z -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -lm -L$(DEPDIR_SEC) -lsecurec
-TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR_HDFUTILS) -lhdf_utils.z -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -lm -L$(DEPDIR_SEC) -lsecurec
+WPA_LDFLAGS = -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -lm -L$(DEPDIR_SEC) -lsecurec
+TEST_LDFLAGS = -L./ -lwpa -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -lm -L$(DEPDIR_SEC) -lsecurec
 
 WPA_SHARED = libwpa.so
 WPA_STATIC = libwpa.a

wpa_supplicant-2.9_standard/hostapd/Makefile

@@ -44,8 +44,6 @@ CFLAGS += -I$(abspath ../../../../third_party/bounds_checking_function/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/ability/sbuf/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/include/core)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/adapter/syscall/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf/posix/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf2/osal/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/shared/include)
 CFLAGS += -I$(abspath ../../../../drivers/peripheral/wlan/client/include)
 CFLAGS += -I$(abspath ../../../../base/hiviewdfx/hilog/interfaces/native/innerkits/include)
@@ -59,7 +57,7 @@ DEPDIR_WIFIDRIVERCLIENT = $(abspath ../../../../out/ohos-arm-release/common/comm
 DEPDIR_HDFUTILS = $(abspath ../../../../out/ohos-arm-release/hdf/hdf)
 DEPDIR_HILOG = $(abspath ../../../../out/ohos-arm-release/hiviewdfx/hilog/)
 DEPDIR_SEC = $(abspath ../../../../device/hisilicon/hispark_taurus/sdk_linux/soc/lib/)
-LIBS += -L$(DEPDIR_HDFUTILS) -lhdf_utils.z -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -L$(DEPDIR_SEC) -lsecurec
+LIBS += -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -L$(DEPDIR_SEC) -lsecurec
 
 export BINDIR ?= /usr/local/bin/
 

wpa_supplicant-2.9_standard/src/drivers/wpa_hal.c

@@ -1036,9 +1036,11 @@ static void WifiWpaHwFeatureDataFree(struct hostapd_hw_modes **modes, uint16_t n
 
 static struct hostapd_hw_modes *WifiWpaGetHwFeatureData(void *priv, uint16_t *numModes, uint16_t *flags, uint8_t *dfs)
 {
-    WifiModes modesData[] = {{12, HOSTAPD_MODE_IEEE80211G}, {4, HOSTAPD_MODE_IEEE80211B}};
+    WifiModes modesData[] = {{IEEE80211G_RATES_NUM, HOSTAPD_MODE_IEEE80211G},
+        {IEEE80211B_RATES_NUM, HOSTAPD_MODE_IEEE80211B}, {IEEE80211A_RATES_NUM, HOSTAPD_MODE_IEEE80211A}};
     size_t loop;
     uint32_t index;
+    uint32_t iee80211band;
     WifiHwFeatureData hwFeatureData;
     WifiDriverData *drv = (WifiDriverData *)priv;
     (void)dfs;
@@ -1052,7 +1054,9 @@ static struct hostapd_hw_modes *WifiWpaGetHwFeatureData(void *priv, uint16_t *nu
     if (WifiCmdGetHwFeature(drv->iface, &hwFeatureData) != SUCC) {
         return NULL;
     }
-
+    if (hwFeatureData.bands[IEEE80211_BAND_5GHZ].channelNum != 0) {
+        *numModes = sizeof(modesData) / sizeof(WifiModes);
+    }
     struct hostapd_hw_modes *modes = os_calloc(*numModes, sizeof(struct hostapd_hw_modes));
     if (modes == NULL) {
         return NULL;
@@ -1064,25 +1068,34 @@ static struct hostapd_hw_modes *WifiWpaGetHwFeatureData(void *priv, uint16_t *nu
     }
 
     modes[0].ht_capab = hwFeatureData.htCapab;
-    for (index = 0; index < sizeof(modesData) / sizeof(WifiModes); index++) {
+    iee80211band = IEEE80211_BAND_2GHZ;
+    for (index = 0; index < *numModes; index++) {
+        if (index >= DEFAULT_NUM_MODES) {
+            iee80211band = IEEE80211_BAND_5GHZ;
+        }
         modes[index].mode = modesData[index].mode;
-        modes[index].num_channels = hwFeatureData.channelNum;
+        modes[index].num_channels = hwFeatureData.bands[iee80211band].channelNum;
         modes[index].num_rates = modesData[index].numRates;
-        modes[index].channels = os_calloc(hwFeatureData.channelNum, sizeof(struct hostapd_channel_data));
+        modes[index].channels = os_calloc(hwFeatureData.bands[iee80211band].channelNum, sizeof(struct hostapd_channel_data));
         modes[index].rates = os_calloc(modes[index].num_rates, sizeof(uint32_t));
         if ((modes[index].channels == NULL) || (modes[index].rates == NULL)) {
             WifiWpaHwFeatureDataFree(&modes, *numModes);
             return NULL;
         }
 
-        for (loop = 0; loop < (size_t)hwFeatureData.channelNum; loop++) {
-            modes[index].channels[loop].chan = hwFeatureData.iee80211Channel[loop].channel;
-            modes[index].channels[loop].freq = hwFeatureData.iee80211Channel[loop].freq;
-            modes[index].channels[loop].flag = hwFeatureData.iee80211Channel[loop].flags;
+        for (loop = 0; loop < (size_t)hwFeatureData.bands[iee80211band].channelNum; loop++) {
+            modes[index].channels[loop].chan = hwFeatureData.bands[iee80211band].iee80211Channel[loop].channel;
+            modes[index].channels[loop].freq = hwFeatureData.bands[iee80211band].iee80211Channel[loop].freq;
+            modes[index].channels[loop].flag = hwFeatureData.bands[iee80211band].iee80211Channel[loop].flags;
+        }
+        
+        for (loop = 0; loop < (size_t)modes[index].num_rates; loop++) {
+            if (index < DEFAULT_NUM_MODES) {
+                modes[index].rates[loop] = hwFeatureData.bitrate[loop];
+            } else {
+                modes[index].rates[loop] = hwFeatureData.bitrate[loop + IEEE80211B_RATES_NUM];
+            }
         }
-
-        for (loop = 0; loop < (size_t)modes[index].num_rates; loop++)
-            modes[index].rates[loop] = hwFeatureData.bitrate[loop];
     }
 
     wpa_printf(MSG_INFO, "WifiWpaGetHwFeatureData done");
@@ -1370,6 +1383,23 @@ static void WifiSetApFreq(WifiApSetting *apsettings, const struct wpa_driver_ap_
     }
 }
 
+static void WifiSetApBand(WifiApSetting *apsettings, struct hostapd_data *hapd)
+{
+    if ((apsettings!= NULL) && (hapd!= NULL)) {
+        switch (hapd->conf->wps_rf_bands) {
+            case WPS_RF_24GHZ:
+                apsettings->freqParams.band = IEEE80211_BAND_2GHZ;
+                break;
+            case WPS_RF_50GHZ:
+                apsettings->freqParams.band = IEEE80211_BAND_5GHZ;
+                break;
+            default:
+                apsettings->freqParams.band = IEEE80211_BAND_2GHZ;
+                break;
+        }
+    }
+}
+
 static int WifiSetApBeaconData(WifiApSetting *apsettings, const struct wpa_driver_ap_params *params)
 {
     if ((params->head != NULL) && (params->head_len != 0)) {
@@ -1472,6 +1502,7 @@ static int32_t WifiWpaSetAp(void *priv, struct wpa_driver_ap_params *params)
         }
     }
     WifiSetApFreq(apsettings, params);
+    WifiSetApBand(apsettings, drv->hapd);
     if (WifiSetApBeaconData(apsettings, params) != SUCC) {
         goto failed;
     }

wpa_supplicant-2.9_standard/src/drivers/wpa_hal_event.c

@@ -10,7 +10,6 @@
 #include "utils/common.h"
 #include "driver.h"
 #include "eloop.h"
-#include "utils/hdf_base.h"
 #include "l2_packet/l2_packet.h"
 #include "wpa_hal.h"
 #include "wpa_supplicant_i.h"

wpa_supplicant-2.9_standard/wpa_supplicant/Makefile

@@ -60,8 +60,6 @@ CFLAGS += -I$(abspath ../../../../drivers/framework/ability/sbuf/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/shared/include)
 CFLAGS += -I$(abspath ../../../../drivers/framework/include/core)
 CFLAGS += -I$(abspath ../../../../drivers/framework/core/adapter/syscall/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf/posix/include)
-CFLAGS += -I$(abspath ../../../../drivers/adapter/uhdf2/osal/include)
 CFLAGS += -I$(abspath ../../../../third_party/bounds_checking_function/include)
 CFLAGS += -I$(abspath ../../../../drivers/peripheral/wlan/client/include)
 CFLAGS += -I$(abspath ../../../../base/hiviewdfx/hilog/interfaces/native/innerkits/include)
@@ -75,7 +73,7 @@ DEPDIR_WIFIDRIVERCLIENT = $(abspath ../../../../out/ohos-arm-release/common/comm
 DEPDIR_HDFUTILS = $(abspath ../../../../out/ohos-arm-release/hdf/hdf)
 DEPDIR_HILOG = $(abspath ../../../../out/ohos-arm-release/hiviewdfx/hilog/)
 DEPDIR_SEC = $(abspath ../../../../device/hisilicon/hispark_taurus/sdk_linux/soc/lib/)
-LIBS += -L$(DEPDIR_HDFUTILS) -lhdf_utils.z -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -L$(DEPDIR_SEC) -lsecurec
+LIBS += -L$(DEPDIR_HILOG) -lhilog -L$(DEPDIR_WIFIDRIVERCLIENT) -lwifi_driver_client.z -L$(DEPDIR_SEC) -lsecurec
 -include .config
 
 ifeq ($(COMPILER_TYPE), clang)