aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBruno Randolf2010-12-16 11:30:22 +0900
committerJohn W. Linville2010-12-20 14:46:58 -0500
commit7f531e03abf0162df3966c4fa5fa6fdd9302cb6b (patch)
treeb5e91c5ee9580e942749768e96421c1e55c3491b /include
parentc7108a7111cd9e592d6ad498be37276dbea75d2b (diff)
cfg80211: Separate available antennas for RX and TX
As has been pointed out by Daniel Halperin some devices (e.g. Intel IWL5100) can only TX from a subset of RX antennas, so use separate availability masks for RX and TX. Signed-off-by: Bruno Randolf <br1@einfach.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'include')
-rw-r--r--include/net/cfg80211.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 924d60366233..bcc9f448ec4e 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1482,8 +1482,13 @@ struct ieee80211_txrx_stypes {
* transmitted through nl80211, points to an array indexed by interface
* type
*
- * @available_antennas: bitmap of antennas which are available to configure.
- * antenna configuration commands will be rejected unless this is set.
+ * @available_antennas_tx: bitmap of antennas which are available to be
+ * configured as TX antennas. Antenna configuration commands will be
+ * rejected unless this or @available_antennas_rx is set.
+ *
+ * @available_antennas_rx: bitmap of antennas which are available to be
+ * configured as RX antennas. Antenna configuration commands will be
+ * rejected unless this or @available_antennas_tx is set.
*
* @max_remain_on_channel_duration: Maximum time a remain-on-channel operation
* may request, if implemented.
@@ -1528,7 +1533,8 @@ struct wiphy {
u8 max_num_pmkids;
- u32 available_antennas;
+ u32 available_antennas_tx;
+ u32 available_antennas_rx;
/* If multiple wiphys are registered and you're handed e.g.
* a regular netdev with assigned ieee80211_ptr, you won't