Skip to content

T
Third Party Wpa Supplicant

OpenHarmony / Third Party Wpa Supplicant
9 个月 前同步成功

通知 2
Star 19
Fork 0
T
Third Party Wpa Supplicant

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 9a5ceb31 编写于 作者: O openharmony_ci 提交者： Gitee
浏览文件
操作

!28 适配ARM-64位编译 

Merge pull request !28 from 毛宇锋/master
上级 f377c766 c223efde
隐藏空白更改
内联 并排
Showing with 10 addition and 10 deletion
wpa_supplicant-2.9/src/drivers/wpa_hal.c
浏览文件 @ 9a5ceb31
......@@ -402,7 +402,7 @@ static int32_t WifiWpaSetKey(const char *ifname, void *priv, enum wpa_alg alg, c
return ret;
}
static void WifiWpaReceiveEapol(void *ctx, const uint8_t *srcAddr, const uint8_t *buf, uint32_t len)
static void WifiWpaReceiveEapol(void *ctx, const uint8_t *srcAddr, const uint8_t *buf, size_t len)
{
WifiDriverData *drv = ctx;
......@@ -961,7 +961,7 @@ static const uint8_t *WifiWpaGetMacAddr(void *priv)
return drv->ownAddr;
}
int32_t WifiWpaWpaSendEapol(void *priv, const uint8_t *dest, uint16_t proto, const uint8_t *data, uint32_t dataLen)
int32_t WifiWpaWpaSendEapol(void *priv, const uint8_t *dest, uint16_t proto, const uint8_t *data, size_t dataLen)
{
WifiDriverData *drv = priv;
int32_t ret;
......@@ -1199,7 +1199,7 @@ static int32_t WifiWpaScanProcessSsid(struct wpa_driver_scan_params *params, Wif
}
for (loop = 0; (loop < params->num_ssids) && (loop < WPAS_MAX_SCAN_SSIDS); loop++) {
wpa_printf(MSG_INFO, "WIFI: Scan : %s SSID : %d\n", params->ssids[loop].ssid, params->ssids[loop].ssid_len);
wpa_printf(MSG_INFO, "WIFI: Scan : %s SSID : %zu\n", params->ssids[loop].ssid, params->ssids[loop].ssid_len);
if (params->ssids[loop].ssid_len > MAX_SSID_LEN) {
params->ssids[loop].ssid_len = MAX_SSID_LEN;
......@@ -2057,7 +2057,7 @@ int32_t WifiWpaGetDrvFlags(void *priv, uint64_t *drvFlags)
return -EFAIL;
}
*drvFlags = params->drvFlags;
wpa_printf(MSG_INFO, "%s drvFlags:%llx.", __FUNCTION__, *drvFlags);
wpa_printf(MSG_INFO, "%s Get drvFlags done.", __FUNCTION__);
os_free(params);
return ret;
}
......
wpa_supplicant-2.9/wpa_supplicant/wpa_supplicant.c
浏览文件 @ 9a5ceb31
......@@ -5842,7 +5842,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
uint64_t drv_flags = 0;
if (WifiWpaGetDrvFlags(wpa_s->drv_priv, &drv_flags) == SUCC) {
wpa_s->drv_flags |= drv_flags;
wpa_printf(MSG_INFO, "%s WifiWpaGetDrvFlags:%11llx.", __FUNCTION__, drv_flags);
wpa_printf(MSG_INFO, "%s WifiWpaGetDrvFlags done.", __FUNCTION__);
}
#endif // CONFIG_OHOS_P2P
......
wpa_supplicant-2.9_standard/src/drivers/wpa_hal.c
浏览文件 @ 9a5ceb31
......@@ -402,7 +402,7 @@ static int32_t WifiWpaSetKey(const char *ifname, void *priv, enum wpa_alg alg, c
return ret;
}
static void WifiWpaReceiveEapol(void *ctx, const uint8_t *srcAddr, const uint8_t *buf, uint32_t len)
static void WifiWpaReceiveEapol(void *ctx, const uint8_t *srcAddr, const uint8_t *buf, size_t len)
{
WifiDriverData *drv = ctx;
......@@ -961,7 +961,7 @@ static const uint8_t *WifiWpaGetMacAddr(void *priv)
return drv->ownAddr;
}
int32_t WifiWpaWpaSendEapol(void *priv, const uint8_t *dest, uint16_t proto, const uint8_t *data, uint32_t dataLen)
int32_t WifiWpaWpaSendEapol(void *priv, const uint8_t *dest, uint16_t proto, const uint8_t *data, size_t dataLen)
{
WifiDriverData *drv = priv;
int32_t ret;
......@@ -1199,7 +1199,7 @@ static int32_t WifiWpaScanProcessSsid(struct wpa_driver_scan_params *params, Wif
}
for (loop = 0; (loop < params->num_ssids) && (loop < WPAS_MAX_SCAN_SSIDS); loop++) {
wpa_printf(MSG_INFO, "WIFI: Scan : %s SSID : %d\n", params->ssids[loop].ssid, params->ssids[loop].ssid_len);
wpa_printf(MSG_INFO, "WIFI: Scan : %s SSID : %zu\n", params->ssids[loop].ssid, params->ssids[loop].ssid_len);
if (params->ssids[loop].ssid_len > MAX_SSID_LEN) {
params->ssids[loop].ssid_len = MAX_SSID_LEN;
......@@ -2057,7 +2057,7 @@ int32_t WifiWpaGetDrvFlags(void *priv, uint64_t *drvFlags)
return -EFAIL;
}
*drvFlags = params->drvFlags;
wpa_printf(MSG_INFO, "%s drvFlags:%llx.", __FUNCTION__, *drvFlags);
wpa_printf(MSG_INFO, "%s Get drvFlags done.", __FUNCTION__);
os_free(params);
return ret;
}
......
wpa_supplicant-2.9_standard/wpa_supplicant/wpa_supplicant.c
浏览文件 @ 9a5ceb31
......@@ -5842,7 +5842,7 @@ static int wpa_supplicant_init_iface(struct wpa_supplicant *wpa_s,
uint64_t drv_flags = 0;
if (WifiWpaGetDrvFlags(wpa_s->drv_priv, &drv_flags) == SUCC) {
wpa_s->drv_flags |= drv_flags;
wpa_printf(MSG_INFO, "%s WifiWpaGetDrvFlags:%11llx.", __FUNCTION__, drv_flags);
wpa_printf(MSG_INFO, "%s WifiWpaGetDrvFlags done.", __FUNCTION__);
}
#endif // CONFIG_OHOS_P2P
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或