[MAC80211]: remove unused ioctls (1)

The ioctls

 * PRISM2_PARAM_ANTENNA_MODE
 * PRISM2_PARAM_STAT_TIME

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 6a2a0c3..ff6a9c3 100644 (file)
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -302,9 +302,6 @@ struct ieee80211_conf {
        u8 antenna_sel_tx;
        u8 antenna_sel_rx;
 
-       int antenna_def;
-       int antenna_mode;
-
        /* Following five fields are used for IEEE 802.11H */
        unsigned int radar_detect;
        unsigned int spect_mgmt;

diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h
index 77a5c88..f0f8051 100644 (file)
--- a/net/mac80211/hostapd_ioctl.h
+++ b/net/mac80211/hostapd_ioctl.h
@@ -32,8 +32,6 @@ enum {
        PRISM2_PARAM_PREAMBLE = 1003,
        PRISM2_PARAM_SHORT_SLOT_TIME = 1006,
        PRISM2_PARAM_NEXT_MODE = 1008,
-       PRISM2_PARAM_ANTENNA_MODE = 1013,
-       PRISM2_PARAM_STAT_TIME = 1016,
        PRISM2_PARAM_STA_ANTENNA_SEL = 1017,
        PRISM2_PARAM_TX_POWER_REDUCTION = 1022,
        PRISM2_PARAM_KEY_TX_RX_THRESHOLD = 1024,

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 703f998..8f47237 100644 (file)
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -786,42 +786,6 @@ struct dev_mc_list *ieee80211_get_mc_list_item(struct ieee80211_hw *hw,
 }
 EXPORT_SYMBOL(ieee80211_get_mc_list_item);
 
-static void ieee80211_stat_refresh(unsigned long data)
-{
-       struct ieee80211_local *local = (struct ieee80211_local *) data;
-       struct sta_info *sta;
-       struct ieee80211_sub_if_data *sdata;
-
-       if (!local->stat_time)
-               return;
-
-       /* go through all stations */
-       read_lock_bh(&local->sta_lock);
-       list_for_each_entry(sta, &local->sta_list, list) {
-               sta->channel_use = (sta->channel_use_raw / local->stat_time) /
-                       CHAN_UTIL_PER_10MS;
-               sta->channel_use_raw = 0;
-       }
-       read_unlock_bh(&local->sta_lock);
-
-       /* go through all subinterfaces */
-       read_lock(&local->sub_if_lock);
-       list_for_each_entry(sdata, &local->sub_if_list, list) {
-               sdata->channel_use = (sdata->channel_use_raw /
-                                     local->stat_time) / CHAN_UTIL_PER_10MS;
-               sdata->channel_use_raw = 0;
-       }
-       read_unlock(&local->sub_if_lock);
-
-       /* hardware interface */
-       local->channel_use = (local->channel_use_raw /
-                             local->stat_time) / CHAN_UTIL_PER_10MS;
-       local->channel_use_raw = 0;
-
-       local->stat_timer.expires = jiffies + HZ * local->stat_time / 100;
-       add_timer(&local->stat_timer);
-}
-
 void ieee80211_tx_status_irqsafe(struct ieee80211_hw *hw,
                                 struct sk_buff *skb,
                                 struct ieee80211_tx_status *status)
@@ -1260,9 +1224,6 @@ struct ieee80211_hw *ieee80211_alloc_hw(size_t priv_data_len,
        INIT_LIST_HEAD(&local->sub_if_list);
 
        INIT_DELAYED_WORK(&local->scan_work, ieee80211_sta_scan_work);
-       init_timer(&local->stat_timer);
-       local->stat_timer.function = ieee80211_stat_refresh;
-       local->stat_timer.data = (unsigned long) local;
        ieee80211_rx_bss_list_init(mdev);
 
        sta_info_init(local);
@@ -1461,9 +1422,6 @@ void ieee80211_unregister_hw(struct ieee80211_hw *hw)
 
        rtnl_unlock();
 
-       if (local->stat_time)
-               del_timer_sync(&local->stat_timer);
-
        ieee80211_rx_bss_list_deinit(local->mdev);
        ieee80211_clear_tx_pending(local);
        sta_info_stop(local);

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index cc9999c..2caf1a2 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -509,8 +509,6 @@ struct ieee80211_local {
 
        u32 channel_use;
        u32 channel_use_raw;
-       u32 stat_time;
-       struct timer_list stat_timer;
 
 #ifdef CONFIG_MAC80211_DEBUGFS
        struct work_struct sta_debugfs_add;

diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index b89fb1f..946aeb5 100644 (file)
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -1075,15 +1075,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev,
                }
                break;
 
-       case PRISM2_PARAM_STAT_TIME:
-               if (!local->stat_time && value) {
-                       local->stat_timer.expires = jiffies + HZ * value / 100;
-                       add_timer(&local->stat_timer);
-               } else if (local->stat_time && !value) {
-                       del_timer_sync(&local->stat_timer);
-               }
-               local->stat_time = value;
-               break;
        case PRISM2_PARAM_SHORT_SLOT_TIME:
                if (value)
                        local->hw.conf.flags |= IEEE80211_CONF_SHORT_SLOT_TIME;
@@ -1097,12 +1088,6 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev,
                local->next_mode = value;
                break;
 
-       case PRISM2_PARAM_ANTENNA_MODE:
-               local->hw.conf.antenna_mode = value;
-               if (ieee80211_hw_config(local))
-                       ret = -EINVAL;
-               break;
-
        case PRISM2_PARAM_STA_ANTENNA_SEL:
                local->sta_antenna_sel = value;
                break;
@@ -1194,9 +1179,6 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
                *param = sdata->short_preamble;
                break;
 
-       case PRISM2_PARAM_STAT_TIME:
-               *param = local->stat_time;
-               break;
        case PRISM2_PARAM_SHORT_SLOT_TIME:
                *param = !!(local->hw.conf.flags & IEEE80211_CONF_SHORT_SLOT_TIME);
                break;
@@ -1205,10 +1187,6 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
                *param = local->next_mode;
                break;
 
-       case PRISM2_PARAM_ANTENNA_MODE:
-               *param = local->hw.conf.antenna_mode;
-               break;
-
        case PRISM2_PARAM_STA_ANTENNA_SEL:
                *param = local->sta_antenna_sel;
                break;