8 files changed, 0 insertions, 62 deletions

diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index ff6a9c35e6d6..1c59e24544c7 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -296,7 +296,6 @@ struct ieee80211_conf {
         u8 power_level;                 /* transmit power limit for current
                                          * regulatory domain; in dBm */
         u8 antenna_max;                 /* maximum antenna gain */
-        short tx_power_reduction; /* in 0.1 dBm */
 
         /* 0 = default/diversity, 1 = Ant0, 2 = Ant1 */
         u8 antenna_sel_tx;
diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index 476c8486f789..76c39eb72817 100644
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -110,9 +110,6 @@ DEBUGFS_READONLY_FILE(mode, 20, "%s",
                       ieee80211_mode_str(local->hw.conf.phymode));
 DEBUGFS_READONLY_FILE(wep_iv, 20, "%#06x",
                       local->wep_iv & 0xffffff);
-DEBUGFS_READONLY_FILE(tx_power_reduction, 20, "%d.%d dBm",
-                      local->hw.conf.tx_power_reduction / 10,
-                      local->hw.conf.tx_power_reduction % 10);
 DEBUGFS_READONLY_FILE(rate_ctrl_alg, 100, "%s",
                       local->rate_ctrl ? local->rate_ctrl->ops->name : "<unset>");
 
@@ -317,7 +314,6 @@ void debugfs_hw_add(struct ieee80211_local *local)
         DEBUGFS_ADD(total_ps_buffered);
         DEBUGFS_ADD(mode);
         DEBUGFS_ADD(wep_iv);
-        DEBUGFS_ADD(tx_power_reduction);
         DEBUGFS_ADD(modes);
 
         statsd = debugfs_create_dir("statistics", phyd);
@@ -382,7 +378,6 @@ void debugfs_hw_del(struct ieee80211_local *local)
         DEBUGFS_DEL(total_ps_buffered);
         DEBUGFS_DEL(mode);
         DEBUGFS_DEL(wep_iv);
-        DEBUGFS_DEL(tx_power_reduction);
         DEBUGFS_DEL(modes);
 
         DEBUGFS_STATS_DEL(transmitted_fragment_count);
diff --git a/net/mac80211/hostapd_ioctl.h b/net/mac80211/hostapd_ioctl.h
index f0f8051502da..8d219d67db35 100644
--- a/net/mac80211/hostapd_ioctl.h
+++ b/net/mac80211/hostapd_ioctl.h
@@ -32,10 +32,7 @@ enum {
         PRISM2_PARAM_PREAMBLE = 1003,
         PRISM2_PARAM_SHORT_SLOT_TIME = 1006,
         PRISM2_PARAM_NEXT_MODE = 1008,
-        PRISM2_PARAM_STA_ANTENNA_SEL = 1017,
-        PRISM2_PARAM_TX_POWER_REDUCTION = 1022,
         PRISM2_PARAM_KEY_TX_RX_THRESHOLD = 1024,
-        PRISM2_PARAM_DEFAULT_WEP_ONLY = 1026,
         PRISM2_PARAM_WIFI_WME_NOACK_TEST = 1033,
         PRISM2_PARAM_SCAN_FLAGS = 1035,
         PRISM2_PARAM_HW_MODES = 1036,
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 2caf1a2f31f7..2f6fff6317eb 100644
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -514,12 +514,6 @@ struct ieee80211_local {
         struct work_struct sta_debugfs_add;
 #endif
 
-        enum {
-                STA_ANTENNA_SEL_AUTO = 0,
-                STA_ANTENNA_SEL_SW_CTRL = 1,
-                STA_ANTENNA_SEL_SW_CTRL_DEBUG = 2
-        } sta_antenna_sel;
-
 #ifdef CONFIG_MAC80211_DEBUG_COUNTERS
         /* TX/RX handler statistics */
         unsigned int tx_handlers_drop;
@@ -555,10 +549,6 @@ struct ieee80211_local {
         int total_ps_buffered; /* total number of all buffered unicast and
                                 * multicast packets for power saving stations
                                 */
-        int allow_broadcast_always; /* whether to allow TX of broadcast frames
-                                     * even when there are no associated STAs
-                                     */
-
         int wifi_wme_noack_test;
         unsigned int wmm_acm; /* bit field of ACM bits (BIT(802.1D tag)) */
 
@@ -585,7 +575,6 @@ struct ieee80211_local {
                 struct dentry *total_ps_buffered;
                 struct dentry *mode;
                 struct dentry *wep_iv;
-                struct dentry *tx_power_reduction;
                 struct dentry *modes;
                 struct dentry *statistics;
                 struct local_debugfsdentries_statsdentries {
diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/ieee80211_ioctl.c
index 946aeb51a12b..2e85032808fe 100644
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/ieee80211_ioctl.c
@@ -1088,25 +1088,10 @@ static int ieee80211_ioctl_prism2_param(struct net_device *dev,
                 local->next_mode = value;
                 break;
 
-        case PRISM2_PARAM_STA_ANTENNA_SEL:
-                local->sta_antenna_sel = value;
-                break;
-
-        case PRISM2_PARAM_TX_POWER_REDUCTION:
-                if (value < 0)
-                        ret = -EINVAL;
-                else
-                        local->hw.conf.tx_power_reduction = value;
-                break;
-
         case PRISM2_PARAM_KEY_TX_RX_THRESHOLD:
                 local->key_tx_rx_threshold = value;
                 break;
 
-        case PRISM2_PARAM_DEFAULT_WEP_ONLY:
-                ret = ieee80211_ioctl_default_wep_only(local, value);
-                break;
-
         case PRISM2_PARAM_WIFI_WME_NOACK_TEST:
                 local->wifi_wme_noack_test = value;
                 break;
@@ -1187,22 +1172,10 @@ static int ieee80211_ioctl_get_prism2_param(struct net_device *dev,
                 *param = local->next_mode;
                 break;
 
-        case PRISM2_PARAM_STA_ANTENNA_SEL:
-                *param = local->sta_antenna_sel;
-                break;
-
-        case PRISM2_PARAM_TX_POWER_REDUCTION:
-                *param = local->hw.conf.tx_power_reduction;
-                break;
-
         case PRISM2_PARAM_KEY_TX_RX_THRESHOLD:
                 *param = local->key_tx_rx_threshold;
                 break;
 
-        case PRISM2_PARAM_DEFAULT_WEP_ONLY:
-                *param = local->default_wep_only;
-                break;
-
         case PRISM2_PARAM_WIFI_WME_NOACK_TEST:
                 *param = local->wifi_wme_noack_test;
                 break;
diff --git a/net/mac80211/rc80211_simple.c b/net/mac80211/rc80211_simple.c
index 17b9f46bbf2b..ef91ce428aca 100644
--- a/net/mac80211/rc80211_simple.c
+++ b/net/mac80211/rc80211_simple.c
@@ -147,14 +147,6 @@ static void rate_control_simple_tx_status(void *priv, struct net_device *dev,
         srctrl = sta->rate_ctrl_priv;
         srctrl->tx_num_xmit++;
         if (status->excessive_retries) {
-                sta->antenna_sel_tx = sta->antenna_sel_tx == 1 ? 2 : 1;
-                sta->antenna_sel_rx = sta->antenna_sel_rx == 1 ? 2 : 1;
-                if (local->sta_antenna_sel == STA_ANTENNA_SEL_SW_CTRL_DEBUG) {
-                        printk(KERN_DEBUG "%s: " MAC_FMT " TX antenna --> %d "
-                               "RX antenna --> %d (@%lu)\n",
-                               dev->name, MAC_ARG(hdr->addr1),
-                               sta->antenna_sel_tx, sta->antenna_sel_rx, jiffies);
-                }
                 srctrl->tx_num_failures++;
                 sta->tx_retry_failed++;
                 sta->tx_num_consecutive_failures++;
diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index b5ef72379add..4afa7df2a180 100644
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -90,10 +90,6 @@ struct sta_info {
         int channel_use;
         int channel_use_raw;
 
-        u8 antenna_sel_tx;
-        u8 antenna_sel_rx;
-
-
         int key_idx_compression; /* key table index for compression and TX
                                   * filtering; used only if sta->key is not
                                   * set */
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 4ab29282dd67..c9b909d9498b 100644
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -243,7 +243,6 @@ ieee80211_tx_h_check_assoc(struct ieee80211_txrx_data *tx)
         } else {
                 if (unlikely((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
                              tx->local->num_sta == 0 &&
-                             !tx->local->allow_broadcast_always &&
                              tx->sdata->type != IEEE80211_IF_TYPE_IBSS)) {
                         /*
                          * No associated STAs - no need to send multicast
@@ -959,8 +958,6 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
          */
         control->power_level = local->hw.conf.power_level;
         control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;
-        if (local->sta_antenna_sel != STA_ANTENNA_SEL_AUTO && tx->sta)
-                control->antenna_sel_tx = tx->sta->antenna_sel_tx;
 
         /* process and remove the injection radiotap header */
         sdata = IEEE80211_DEV_TO_SUB_IF(dev);