From 25ba219f3e0278bfacdd058797903661a5c45f31 Mon Sep 17 00:00:00 2001
From: Jouni Malinen <j@w1.fi>
Date: Tue, 13 Jan 2009 19:12:25 +0200
Subject: [PATCH] Removed unused set_regulatory_domain driver function
---
hostapd/driver.h | 1 -
hostapd/driver_i.h | 9 ---------
hostapd/driver_nl80211.c | 7 -------
3 files changed, 17 deletions(-)
diff --git a/hostapd/driver.h b/hostapd/driver.h
index 28d4f80ee..ba89c1235 100644
--- a/hostapd/driver.h
+++ b/hostapd/driver.h
@@ -136,7 +136,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_regulatory_domain)(void *priv, unsigned int rd);
int (*set_country)(void *priv, const char *country);
int (*set_ieee80211d)(void *priv, int enabled);
int (*set_beacon)(const char *ifname, void *priv,
diff --git a/hostapd/driver_i.h b/hostapd/driver_i.h
index 1eb65db16..2d9734390 100644
--- a/hostapd/driver_i.h
+++ b/hostapd/driver_i.h
@@ -343,15 +343,6 @@ hostapd_set_rate_sets(struct hostapd_data *hapd, int *supp_rates,
basic_rates, mode);
}
-static inline int
-hostapd_set_regulatory_domain(struct hostapd_data *hapd, unsigned int rd)
-{
- if (hapd->driver == NULL ||
- hapd->driver->set_regulatory_domain == NULL)
- return 0;
- return hapd->driver->set_regulatory_domain(hapd->drv_priv, rd);
-}
-
static inline int
hostapd_set_country(struct hostapd_data *hapd, const char *country)
{
diff --git a/hostapd/driver_nl80211.c b/hostapd/driver_nl80211.c
index 514243df6..6c01d2639 100644
--- a/hostapd/driver_nl80211.c
+++ b/hostapd/driver_nl80211.c
@@ -920,12 +920,6 @@ static int i802_sta_set_flags(void *priv, const u8 *addr,
}
-static int i802_set_regulatory_domain(void *priv, unsigned int rd)
-{
- return -1;
-}
-
-
static int i802_set_tx_queue_params(void *priv, int queue, int aifs,
int cw_min, int cw_max, int burst_time)
{
@@ -2495,7 +2489,6 @@ const struct wpa_driver_ops wpa_driver_nl80211_ops = {
.set_retry = i802_set_retry,
.get_retry = i802_get_retry,
.set_rate_sets = i802_set_rate_sets,
- .set_regulatory_domain = i802_set_regulatory_domain,
.set_beacon = i802_set_beacon,
.set_internal_bridge = i802_set_internal_bridge,
.set_beacon_int = i802_set_beacon_int,