aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/tx.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-08-28 17:01:53 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:48:45 -0400
commit53cb670042999b8acb70945ce522b015dcdf7b43 (patch)
treee114ad62facc63678dab93b541804432e52a8ba0 /net/mac80211/tx.c
parentb2446b36800948586f1d1b8ef05803bba5f7489e (diff)
[MAC80211]: remove unused ioctls (2)
The ioctls * PRISM2_PARAM_STA_ANTENNA_SEL * PRISM2_PARAM_TX_POWER_REDUCTION * PRISM2_PARAM_DEFAULT_WEP_ONLY 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>
Diffstat (limited to 'net/mac80211/tx.c')
-rw-r--r--net/mac80211/tx.c3
1 files changed, 0 insertions, 3 deletions
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)
243 } else { 243 } else {
244 if (unlikely((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA && 244 if (unlikely((tx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_DATA &&
245 tx->local->num_sta == 0 && 245 tx->local->num_sta == 0 &&
246 !tx->local->allow_broadcast_always &&
247 tx->sdata->type != IEEE80211_IF_TYPE_IBSS)) { 246 tx->sdata->type != IEEE80211_IF_TYPE_IBSS)) {
248 /* 247 /*
249 * No associated STAs - no need to send multicast 248 * No associated STAs - no need to send multicast
@@ -959,8 +958,6 @@ __ieee80211_tx_prepare(struct ieee80211_txrx_data *tx,
959 */ 958 */
960 control->power_level = local->hw.conf.power_level; 959 control->power_level = local->hw.conf.power_level;
961 control->antenna_sel_tx = local->hw.conf.antenna_sel_tx; 960 control->antenna_sel_tx = local->hw.conf.antenna_sel_tx;
962 if (local->sta_antenna_sel != STA_ANTENNA_SEL_AUTO && tx->sta)
963 control->antenna_sel_tx = tx->sta->antenna_sel_tx;
964 961
965 /* process and remove the injection radiotap header */ 962 /* process and remove the injection radiotap header */
966 sdata = IEEE80211_DEV_TO_SUB_IF(dev); 963 sdata = IEEE80211_DEV_TO_SUB_IF(dev);