From 1fb1a6f0bfabdb8f99681423718dcafe42230f5a Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 22 Apr 2009 16:15:24 +0300 Subject: [PATCH] Remove unused set_broadcast_ssid() driver op None of the driver wrappers user this. hostapd-controlled broadcast SSID hiding can only be used with drivers that use hostapd for handling Beacon and Probe Request/Response frames. --- hostapd/driver_i.h | 8 -------- hostapd/hostapd.c | 8 -------- src/drivers/driver.h | 7 ------- src/drivers/driver_ndis.c | 1 - 4 files changed, 24 deletions(-) diff --git a/hostapd/driver_i.h b/hostapd/driver_i.h index eff1140cd..7d3cc06f0 100644 --- a/hostapd/driver_i.h +++ b/hostapd/driver_i.h @@ -345,14 +345,6 @@ hostapd_set_beacon_int(struct hostapd_data *hapd, int value) return hapd->driver->set_beacon_int(hapd->drv_priv, value); } -static inline int -hostapd_set_broadcast_ssid(struct hostapd_data *hapd, int value) -{ - if (hapd->driver == NULL || hapd->driver->set_broadcast_ssid == NULL) - return 0; - return hapd->driver->set_broadcast_ssid(hapd->drv_priv, value); -} - static inline int hostapd_set_cts_protect(struct hostapd_data *hapd, int value) { diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c index e3a9ea957..dfebf8458 100644 --- a/hostapd/hostapd.c +++ b/hostapd/hostapd.c @@ -1159,14 +1159,6 @@ static int hostapd_setup_bss(struct hostapd_data *hapd, int first) return -1; } - /* Set flag for whether SSID is broadcast in beacons */ - if (hostapd_set_broadcast_ssid(hapd, - !!hapd->conf->ignore_broadcast_ssid)) { - wpa_printf(MSG_ERROR, "Could not set broadcast SSID flag for " - "kernel driver"); - return -1; - } - /* Set SSID for the kernel driver (to be used in beacon and probe * response frames) */ if (set_ssid && hostapd_set_ssid(hapd, (u8 *) conf->ssid.ssid, diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 0336ec537..930e464a9 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1281,13 +1281,6 @@ struct wpa_driver_ops { * 1 = enabled, i.e., bridge packets between associated STAs (default) */ int (*set_internal_bridge)(void *priv, int value); - /* Configure broadcast SSID mode: - * 0 = include SSID in Beacon frames and reply to Probe Request frames - * that use broadcast SSID - * 1 = hide SSID from Beacon frames and ignore Probe Request frames for - * broadcast SSID - */ - int (*set_broadcast_ssid)(void *priv, int value); int (*set_cts_protect)(void *priv, int value); int (*set_preamble)(void *priv, int value); int (*set_short_slot_time)(void *priv, int value); diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c index 1e4d99642..158c3f66b 100644 --- a/src/drivers/driver_ndis.c +++ b/src/drivers/driver_ndis.c @@ -3245,7 +3245,6 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = { NULL /* set_rate_sets */, NULL /* hapd_set_beacon */, NULL /* set_internal_bridge */, - NULL /* set_broadcast_ssid */, NULL /* set_cts_protect */, NULL /* set_preamble */, NULL /* set_short_slot_time */,