diff options
author | Bruno Randolf <br1@einfach.org> | 2010-12-15 21:30:22 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2010-12-20 14:46:58 -0500 |
commit | 7f531e03abf0162df3966c4fa5fa6fdd9302cb6b (patch) | |
tree | b5e91c5ee9580e942749768e96421c1e55c3491b /include/net | |
parent | c7108a7111cd9e592d6ad498be37276dbea75d2b (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/net')
-rw-r--r-- | include/net/cfg80211.h | 12 |
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 { | |||
1482 | * transmitted through nl80211, points to an array indexed by interface | 1482 | * transmitted through nl80211, points to an array indexed by interface |
1483 | * type | 1483 | * type |
1484 | * | 1484 | * |
1485 | * @available_antennas: bitmap of antennas which are available to configure. | 1485 | * @available_antennas_tx: bitmap of antennas which are available to be |
1486 | * antenna configuration commands will be rejected unless this is set. | 1486 | * configured as TX antennas. Antenna configuration commands will be |
1487 | * rejected unless this or @available_antennas_rx is set. | ||
1488 | * | ||
1489 | * @available_antennas_rx: bitmap of antennas which are available to be | ||
1490 | * configured as RX antennas. Antenna configuration commands will be | ||
1491 | * rejected unless this or @available_antennas_tx is set. | ||
1487 | * | 1492 | * |
1488 | * @max_remain_on_channel_duration: Maximum time a remain-on-channel operation | 1493 | * @max_remain_on_channel_duration: Maximum time a remain-on-channel operation |
1489 | * may request, if implemented. | 1494 | * may request, if implemented. |
@@ -1528,7 +1533,8 @@ struct wiphy { | |||
1528 | 1533 | ||
1529 | u8 max_num_pmkids; | 1534 | u8 max_num_pmkids; |
1530 | 1535 | ||
1531 | u32 available_antennas; | 1536 | u32 available_antennas_tx; |
1537 | u32 available_antennas_rx; | ||
1532 | 1538 | ||
1533 | /* If multiple wiphys are registered and you're handed e.g. | 1539 | /* If multiple wiphys are registered and you're handed e.g. |
1534 | * a regular netdev with assigned ieee80211_ptr, you won't | 1540 | * a regular netdev with assigned ieee80211_ptr, you won't |