From 9351257cfb0fa02a977e989e072a743bf7bd0da4 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 22 Apr 2009 16:11:22 +0300 Subject: [PATCH] Remove the unused set_ieee80211d driver op None of the driver wrappers use this. Only the drivers that use hostapd for Beacon and Probe Request/Response handling can now use IEEE 802.11d properly. --- hostapd/driver_i.h | 9 --------- hostapd/hostapd.c | 7 ------- src/drivers/driver.h | 1 - src/drivers/driver_ndis.c | 1 - 4 files changed, 18 deletions(-) diff --git a/hostapd/driver_i.h b/hostapd/driver_i.h index 20ac9a1..eff1140 100644 --- a/hostapd/driver_i.h +++ b/hostapd/driver_i.h @@ -310,15 +310,6 @@ hostapd_set_country(struct hostapd_data *hapd, const char *country) } static inline int -hostapd_set_ieee80211d(struct hostapd_data *hapd, int enabled) -{ - if (hapd->driver == NULL || - hapd->driver->set_ieee80211d == NULL) - return 0; - return hapd->driver->set_ieee80211d(hapd->drv_priv, enabled); -} - -static inline int hostapd_sta_clear_stats(struct hostapd_data *hapd, const u8 *addr) { if (hapd->driver == NULL || hapd->driver->sta_clear_stats == NULL) diff --git a/hostapd/hostapd.c b/hostapd/hostapd.c index ff557b6..e3a9ea9 100644 --- a/hostapd/hostapd.c +++ b/hostapd/hostapd.c @@ -1355,13 +1355,6 @@ static int setup_interface(struct hostapd_iface *iface) } } - if (hapd->iconf->ieee80211d && - hostapd_set_ieee80211d(hapd, 1) < 0) { - wpa_printf(MSG_ERROR, "Failed to set ieee80211d (%d)", - hapd->iconf->ieee80211d); - return -1; - } - if (hapd->iconf->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL && hostapd_set_internal_bridge(hapd, hapd->iconf->bridge_packets)) { wpa_printf(MSG_ERROR, "Failed to set bridge_packets for " diff --git a/src/drivers/driver.h b/src/drivers/driver.h index 8551004..0336ec5 100644 --- a/src/drivers/driver.h +++ b/src/drivers/driver.h @@ -1270,7 +1270,6 @@ struct wpa_driver_ops { int total_flags, int flags_or, int flags_and); int (*set_rate_sets)(void *priv, int *supp_rates, int *basic_rates, int mode); - int (*set_ieee80211d)(void *priv, int enabled); int (*hapd_set_beacon)(const char *ifname, void *priv, const u8 *head, size_t head_len, const u8 *tail, size_t tail_len, diff --git a/src/drivers/driver_ndis.c b/src/drivers/driver_ndis.c index e45b231..1e4d996 100644 --- a/src/drivers/driver_ndis.c +++ b/src/drivers/driver_ndis.c @@ -3243,7 +3243,6 @@ const struct wpa_driver_ops wpa_driver_ndis_ops = { NULL /* set_frag */, NULL /* sta_set_flags */, NULL /* set_rate_sets */, - NULL /* set_ieee80211d */, NULL /* hapd_set_beacon */, NULL /* set_internal_bridge */, NULL /* set_broadcast_ssid */, -- 1.7.9.5