aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-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 2870f3973f1a..5f28b7f89887 100644
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
@@ -324,7 +324,7 @@ struct ieee80211_tx_altrate {
324 * @flags: transmit info flags, defined above 324 * @flags: transmit info flags, defined above
325 * @band: TBD 325 * @band: TBD
326 * @tx_rate_idx: TBD 326 * @tx_rate_idx: TBD
327 * @antenna_sel_tx: TBD 327 * @antenna_sel_tx: antenna to use, 0 for automatic diversity
328 * @control: union for control data 328 * @control: union for control data
329 * @status: union for status data 329 * @status: union for status data
330 * @driver_data: array of driver_data pointers 330 * @driver_data: array of driver_data pointers
@@ -474,9 +474,6 @@ static inline int __deprecated __IEEE80211_CONF_SHORT_SLOT_TIME(void)
474 * @listen_interval: listen interval in units of beacon interval 474 * @listen_interval: listen interval in units of beacon interval
475 * @flags: configuration flags defined above 475 * @flags: configuration flags defined above
476 * @power_level: requested transmit power (in dBm) 476 * @power_level: requested transmit power (in dBm)
477 * @antenna_sel_tx: transmit antenna selection, 0: default/diversity,
478 * 1/2: antenna 0/1
479 * @antenna_sel_rx: receive antenna selection, like @antenna_sel_tx
480 * @ht_cap: describes current self configuration of 802.11n HT capabilities 477 * @ht_cap: describes current self configuration of 802.11n HT capabilities
481 * @ht_bss_conf: describes current BSS configuration of 802.11n HT parameters 478 * @ht_bss_conf: describes current BSS configuration of 802.11n HT parameters
482 * @channel: the channel to tune to 479 * @channel: the channel to tune to
@@ -488,8 +485,6 @@ struct ieee80211_conf {
488 u16 listen_interval; 485 u16 listen_interval;
489 u32 flags; 486 u32 flags;
490 int power_level; 487 int power_level;
491 u8 antenna_sel_tx;
492 u8 antenna_sel_rx;
493 488
494 struct ieee80211_channel *channel; 489 struct ieee80211_channel *channel;
495 490