jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

DPP2: Clean up CONFIG_DPP2 use with configurator connectivity IE

Browse source 
Avoid duplicated return statement in CONFIG_DPP2=y builds.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-05-11 17:30:26 +03:00 committed by Jouni Malinen
parent 670e153377
commit 890ae336c0
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ap/ieee802_11_shared.c
View file

@ -886,9 +886,9 @@ size_t hostapd_eid_dpp_cc_len(struct hostapd_data *hapd)
u8 * hostapd_eid_dpp_cc(struct hostapd_data *hapd, u8 *eid, size_t len) u8 * hostapd_eid_dpp_cc(struct hostapd_data *hapd, u8 *eid, size_t len)
{ {
#ifdef CONFIG_DPP2
u8 *pos = eid; u8 *pos = eid;
#ifdef CONFIG_DPP2
if (!hapd->conf->dpp_configurator_connectivity || len < 6) if (!hapd->conf->dpp_configurator_connectivity || len < 6)
return pos; return pos;
@ -897,10 +897,9 @@ u8 * hostapd_eid_dpp_cc(struct hostapd_data *hapd, u8 *eid, size_t len)
WPA_PUT_BE24(pos, OUI_WFA); WPA_PUT_BE24(pos, OUI_WFA);
pos += 3; pos += 3;
*pos++ = DPP_CC_OUI_TYPE; *pos++ = DPP_CC_OUI_TYPE;
#endif /* CONFIG_DPP2 */
return pos; return pos;
#endif /* CONFIG_DPP2 */
return eid;
} }