DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

wpa_supplicant: Add option to explicitly set 4addr mode

Browse source 
Add a new network profile option enable_4addr_mode=1 that puts an
interface in 4addr mode, for interfaces meant to be added to a bridge.

Signed-off-by: Konstantinos Natsakis <infradead.org@aleph-0.net>
This commit is contained in:
Konstantinos Natsakis 2023-02-01 02:16:18 +02:00 committed by Jouni Malinen
parent 1ffc7d1c65
commit 8085a7e656
4 changed files with 37 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
wpa_supplicant/config.c
View file

@ -2710,6 +2710,7 @@ static const struct parse_data ssid_fields[] = {
{ INT_RANGE(transition_disable, 0, 255) }, { INT_RANGE(transition_disable, 0, 255) },
{ INT_RANGE(sae_pk, 0, 2) }, { INT_RANGE(sae_pk, 0, 2) },
{ INT_RANGE(disable_eht, 0, 1)}, { INT_RANGE(disable_eht, 0, 1)},
{ INT_RANGE(enable_4addr_mode, 0, 1)},
}; };
#undef OFFSET #undef OFFSET

1
wpa_supplicant/config_file.c
View file

@ -890,6 +890,7 @@ static void wpa_config_write_network(FILE *f, struct wpa_ssid *ssid)
INT(disable_he); INT(disable_he);
#endif /* CONFIG_HE_OVERRIDES */ #endif /* CONFIG_HE_OVERRIDES */
INT(disable_eht); INT(disable_eht);
INT(enable_4addr_mode);
#undef STR #undef STR
#undef INT #undef INT

11
wpa_supplicant/config_ssid.h
View file

@ -1240,6 +1240,17 @@ struct wpa_ssid {
* to 1 to have it disabled. * to 1 to have it disabled.
*/ */
int disable_eht; int disable_eht;
/**
* enable_4addr_mode - Set 4addr mode after association
* 0 = Do not attempt to set 4addr mode
* 1 = Try to set 4addr mode after association
*
* Linux requires that an interface is set to 4addr mode before it can
* be added to a bridge. Set this to 1 for networks where you intent
* to use the interface in a bridge.
*/
int enable_4addr_mode;
}; };
#endif /* CONFIG_SSID_H */ #endif /* CONFIG_SSID_H */

29
wpa_supplicant/events.c
View file

@ -2705,6 +2705,26 @@ static void interworking_process_assoc_resp(struct wpa_supplicant *wpa_s,
#endif /* CONFIG_INTERWORKING */ #endif /* CONFIG_INTERWORKING */
static void wpa_supplicant_set_4addr_mode(struct wpa_supplicant *wpa_s)
{
if (wpa_s->enabled_4addr_mode) {
wpa_printf(MSG_DEBUG, "4addr mode already set");
return;
}
if (wpa_drv_set_4addr_mode(wpa_s, 1) < 0) {
wpa_msg(wpa_s, MSG_ERROR, "Failed to set 4addr mode");
goto fail;
}
wpa_s->enabled_4addr_mode = 1;
wpa_msg(wpa_s, MSG_INFO, "Successfully set 4addr mode");
return;
fail:
wpa_supplicant_deauthenticate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);
}
static void multi_ap_process_assoc_resp(struct wpa_supplicant *wpa_s, static void multi_ap_process_assoc_resp(struct wpa_supplicant *wpa_s,
const u8 *ies, size_t ies_len) const u8 *ies, size_t ies_len)
{ {
@ -2757,11 +2777,7 @@ static void multi_ap_set_4addr_mode(struct wpa_supplicant *wpa_s)
goto fail; goto fail;
} }
if (wpa_drv_set_4addr_mode(wpa_s, 1) < 0) { wpa_supplicant_set_4addr_mode(wpa_s);
wpa_printf(MSG_ERROR, "Failed to set 4addr mode");
goto fail;
}
wpa_s->enabled_4addr_mode = 1;
return; return;
fail: fail:
@ -3849,6 +3865,9 @@ static void wpa_supplicant_event_assoc(struct wpa_supplicant *wpa_s,
#ifdef CONFIG_DPP2 #ifdef CONFIG_DPP2
wpa_s->dpp_pfs_fallback = 0; wpa_s->dpp_pfs_fallback = 0;
#endif /* CONFIG_DPP2 */ #endif /* CONFIG_DPP2 */
if (wpa_s->current_ssid && wpa_s->current_ssid->enable_4addr_mode)
wpa_supplicant_set_4addr_mode(wpa_s);
} }