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>

diff --git a/hostapd/main.c b/hostapd/main.c
index 748f42a08c16adcbf026f899c24a9780925557ba..05d6273c3fd393095e85838c792e66873ebb60dc 100644 (file)
--- a/hostapd/main.c
+++ b/hostapd/main.c
@@ -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;
 }
 

diff --git a/src/ap/hostapd.c b/src/ap/hostapd.c
index 2ea32ee1f39bd713fd9ee73212eac3955aed38f7..fec79b34053070aacfbfa2b1487a70f559a15899 100644 (file)
--- a/src/ap/hostapd.c
+++ b/src/ap/hostapd.c
@@ -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)) {