[MAC80211]: remove unused ioctls (3)

The ioctls
 * PRISM2_PARAM_RADAR_DETECT
 * PRISM2_PARAM_SPECTRUM_MGMT

are not used by hostapd or wpa_supplicant,

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 1c59e24544c7fed8b8a26f9264831253e54467c4..029e8cb7bf4e08dc4ac769b720d9c0a1cff6e58c 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -300,20 +300,6 @@ struct ieee80211_conf {
        /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
        u8 antenna_sel_tx;
        u8 antenna_sel_rx;
-
-       /* Following five fields are used for IEEE 802.11H */
-       unsigned int radar_detect;
-       unsigned int spect_mgmt;
-       /* All following fields are currently unused. */
-       unsigned int quiet_duration; /* duration of quiet period */
-       unsigned int quiet_offset; /* how far into the beacon is the quiet
-                                   * period */
-       unsigned int quiet_period;
-       u8 radar_firpwr_threshold;
-       u8 radar_rssi_threshold;
-       u8 pulse_height_threshold;
-       u8 pulse_rssi_threshold;
-       u8 pulse_inband_threshold;
 };
 
 /**

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 76c39eb7281710416ea77006f6ddcb180eeb0c4e..dc5ed1a8bf626ca9effec4016fe4faecd00cb2f3 100644 (file)
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -86,8 +86,6 @@ DEBUGFS_READONLY_FILE(channel, 20, "%d",
                      local->hw.conf.channel);
 DEBUGFS_READONLY_FILE(frequency, 20, "%d",
                      local->hw.conf.freq);
-DEBUGFS_READONLY_FILE(radar_detect, 20, "%d",
-                     local->hw.conf.radar_detect);
 DEBUGFS_READONLY_FILE(antenna_sel_tx, 20, "%d",
                      local->hw.conf.antenna_sel_tx);
 DEBUGFS_READONLY_FILE(antenna_sel_rx, 20, "%d",
@@ -302,7 +300,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
 
        DEBUGFS_ADD(channel);
        DEBUGFS_ADD(frequency);
-       DEBUGFS_ADD(radar_detect);
        DEBUGFS_ADD(antenna_sel_tx);
        DEBUGFS_ADD(antenna_sel_rx);
        DEBUGFS_ADD(bridge_packets);
@@ -366,7 +363,6 @@ void debugfs_hw_del(struct ieee80211_local *local)
 {
        DEBUGFS_DEL(channel);
        DEBUGFS_DEL(frequency);
-       DEBUGFS_DEL(radar_detect);
        DEBUGFS_DEL(antenna_sel_tx);
        DEBUGFS_DEL(antenna_sel_rx);
        DEBUGFS_DEL(bridge_packets);

diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h
index 8d219d67db35abe10273350ea5e8dd825cc42cbd..fd072cb24e50525520005f08be5dfe931b85dada 100644 (file)
--- a/net/mac80211/hostapd_ioctl.h
+++ b/net/mac80211/hostapd_ioctl.h
@@ -39,8 +39,6 @@ enum {
        PRISM2_PARAM_CREATE_IBSS = 1037,
        PRISM2_PARAM_WMM_ENABLED = 1038,
        PRISM2_PARAM_MIXED_CELL = 1039,
-       PRISM2_PARAM_RADAR_DETECT = 1043,
-       PRISM2_PARAM_SPECTRUM_MGMT = 1044,
 };
 
 enum {

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 2f6fff6317eb4111f0b3e974476eafe9f1f78896..c557d578aa30d40f3743707849254e3e0b12b02f 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -563,7 +563,6 @@ struct ieee80211_local {
        struct local_debugfsdentries {
                struct dentry *channel;
                struct dentry *frequency;
-               struct dentry *radar_detect;
                struct dentry *antenna_sel_tx;
                struct dentry *antenna_sel_rx;
                struct dentry *bridge_packets;

diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 2e85032808fe632c8bc0f4cf8d985ccdecedb54e..785f437b306afbc3c9e6b0068e3434a3b84df3bd 100644 (file)
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -1125,12 +1125,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev,
                else
                        sdata->u.sta.wmm_enabled = !!value;
                break;
-       case PRISM2_PARAM_RADAR_DETECT:
-               local->hw.conf.radar_detect = value;
-               break;
-       case PRISM2_PARAM_SPECTRUM_MGMT:
-               local->hw.conf.spect_mgmt = value;
-               break;
        default:
                ret = -EOPNOTSUPP;
                break;