Fix AP mode QoS Map configuration to be per-BSS

This is a per-BSS configuration parameter and as such, needs to be
configured to the driver from hostapd_setup_bss() instead of
hostapd_driver_init().

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2013-11-03 19:05:09 +02:00
parent dc036d9ee0
commit bf7f09bd24
2 changed files with 7 additions and 9 deletions

View File

@ -222,15 +222,6 @@ static int hostapd_driver_init(struct hostapd_iface *iface)
iface->drv_max_acl_mac_addrs = capa.max_acl_mac_addrs;
}
#ifdef CONFIG_INTERWORKING
if (hapd->driver->set_qos_map && conf->qos_map_set_len &&
hapd->driver->set_qos_map(hapd->drv_priv, conf->qos_map_set,
conf->qos_map_set_len)) {
wpa_printf(MSG_ERROR, "Failed to initialize QoS Map.");
return -1;
}
#endif /* CONFIG_INTERWORKING */
return 0;
}

View File

@ -785,6 +785,13 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first)
wpa_printf(MSG_ERROR, "GAS server initialization failed");
return -1;
}
if (conf->qos_map_set_len &&
hostapd_drv_set_qos_map(hapd, conf->qos_map_set,
conf->qos_map_set_len)) {
wpa_printf(MSG_ERROR, "Failed to initialize QoS Map");
return -1;
}
#endif /* CONFIG_INTERWORKING */
if (!hostapd_drv_none(hapd) && vlan_init(hapd)) {