Browse Source

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.
Jouni Malinen 15 years ago
parent
commit
579bc0e64c
2 changed files with 3 additions and 3 deletions
  1. 3 1
      hostapd/hostapd.c
  2. 0 2
      hostapd/ieee802_1x.c

+ 3 - 1
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] &&

+ 0 - 2
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);