hostapd: refresh patches
[openwrt/openwrt.git] / package / network / services / hostapd / patches / 730-ft_iface.patch
1 --- a/hostapd/config_file.c
2 +++ b/hostapd/config_file.c
3 @@ -3069,6 +3069,8 @@ static int hostapd_config_fill(struct ho
4 wpa_printf(MSG_INFO,
5 "Line %d: Obsolete peerkey parameter ignored", line);
6 #ifdef CONFIG_IEEE80211R_AP
7 + } else if (os_strcmp(buf, "ft_iface") == 0) {
8 + os_strlcpy(bss->ft_iface, pos, sizeof(bss->ft_iface));
9 } else if (os_strcmp(buf, "mobility_domain") == 0) {
10 if (os_strlen(pos) != 2 * MOBILITY_DOMAIN_ID_LEN ||
11 hexstr2bin(pos, bss->mobility_domain,
12 --- a/src/ap/ap_config.h
13 +++ b/src/ap/ap_config.h
14 @@ -284,6 +284,7 @@ struct airtime_sta_weight {
15 struct hostapd_bss_config {
16 char iface[IFNAMSIZ + 1];
17 char bridge[IFNAMSIZ + 1];
18 + char ft_iface[IFNAMSIZ + 1];
19 char vlan_bridge[IFNAMSIZ + 1];
20 char wds_bridge[IFNAMSIZ + 1];
21
22 --- a/src/ap/wpa_auth_glue.c
23 +++ b/src/ap/wpa_auth_glue.c
24 @@ -1511,8 +1511,12 @@ int hostapd_setup_wpa(struct hostapd_dat
25 wpa_key_mgmt_ft(hapd->conf->wpa_key_mgmt)) {
26 const char *ft_iface;
27
28 - ft_iface = hapd->conf->bridge[0] ? hapd->conf->bridge :
29 - hapd->conf->iface;
30 + if (hapd->conf->ft_iface[0])
31 + ft_iface = hapd->conf->ft_iface;
32 + else if (hapd->conf->bridge[0])
33 + ft_iface = hapd->conf->bridge;
34 + else
35 + ft_iface = hapd->conf->iface;
36 hapd->l2 = l2_packet_init(ft_iface, NULL, ETH_P_RRB,
37 hostapd_rrb_receive, hapd, 1);
38 if (!hapd->l2) {