Move hostapd_set_privacy() call to hostapd.c

IEEE 802.1X code does not need to know about this driver configuration
mechanism and all the other calls were already in hostapd.c.

diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c
index 824e70e..0debda7 100644 (file)
--- a/hostapd/hostapd.c
+++ b/hostapd/hostapd.c
@@ -392,8 +392,10 @@ static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd)
 
        hostapd_broadcast_wep_set(hapd);
 
-       if (hapd->conf->ssid.wep.default_len)
+       if (hapd->conf->ssid.wep.default_len) {
+               hostapd_set_privacy(hapd, 1);
                return 0;
+       }
 
        for (i = 0; i < 4; i++) {
                if (hapd->conf->ssid.wep.key[i] &&

diff --git a/hostapd/ieee802_1x.c b/hostapd/ieee802_1x.c
index 3ed81ee..f16d713 100644 (file)
--- a/hostapd/ieee802_1x.c
+++ b/hostapd/ieee802_1x.c
@@ -1668,8 +1668,6 @@ int ieee802_1x_init(struct hostapd_data *hapd)
 #endif /* CONFIG_NO_RADIUS */
 
        if (hapd->conf->default_wep_key_len) {
-               hostapd_set_privacy(hapd, 1);
-
                for (i = 0; i < 4; i++)
                        hostapd_set_key(hapd->conf->iface, hapd, WPA_ALG_NONE,
                                        NULL, i, 0, NULL, 0, NULL, 0);