summaryrefslogtreecommitdiffstats
path: root/include/net/mac80211.h
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2008-10-09 12:18:04 +0200
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:06 -0400
commit0f4ac38b5999c3d51adad52d61c56c1b99c247ec (patch)
tree0376bd4904597495ce788883d371d794e8c85f69 /include/net/mac80211.h
parentd9fe60dea7779d412b34679f1177c5ca1940ea8d (diff)
mac80211: kill hw.conf.antenna_sel_{rx,tx}
Never actually used. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include/net/mac80211.h')
-rw-r--r--include/net/mac80211.h7
1 files changed, 1 insertions, 6 deletions
diff --git a/include/net/mac80211.h b/include/net/mac80211.h
index 2870f3973f1..5f28b7f8988 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -324,7 +324,7 @@ struct ieee80211_tx_altrate {
* @flags: transmit info flags, defined above
* @band: TBD
* @tx_rate_idx: TBD
- * @antenna_sel_tx: TBD
+ * @antenna_sel_tx: antenna to use, 0 for automatic diversity
* @control: union for control data
* @status: union for status data
* @driver_data: array of driver_data pointers
@@ -474,9 +474,6 @@ static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
* @listen_interval: listen interval in units of beacon interval
* @flags: configuration flags defined above
* @power_level: requested transmit power (in dBm)
- * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
- * 1/2: antenna 0/1
- * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
* @ht_cap: describes current self configuration of 802.11n HT capabilities
* @ht_bss_conf: describes current BSS configuration of 802.11n HT parameters
* @channel: the channel to tune to
@@ -488,8 +485,6 @@ struct ieee80211_conf {
u16 listen_interval;
u32 flags;
int power_level;
- u8 antenna_sel_tx;
- u8 antenna_sel_rx;
struct ieee80211_channel *channel;