cfg80211: Separate available antennas for RX and TX
PATCH 1/3 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 <[email protected]>
--- include/net/cfg80211.h | 12 +++++++++--- net/wireless/nl80211.c | 17 ++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-)
include/net/cfg80211.h +9 -3
@@ -1472,8 +1472,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.
@@ -1518,7 +1523,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
net/wireless/nl80211.c +10 -7
@@ -605,7 +605,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,if (dev->wiphy.flags &WIPHY_FLAG_CONTROL_PORT_PROTOCOL )NLA_PUT_FLAG (msg,NL80211_ATTR_CONTROL_PORT_ETHERTYPE ); -if (dev->wiphy.available_antennas && dev->ops->get_antenna) { +if ((dev->wiphy.available_antennas_tx || + dev->wiphy.available_antennas_rx) && dev->ops->get_antenna) {u32 tx_ant =0 , rx_ant =0 ;int res; res = dev->ops->get_antenna (&dev->wiphy, &tx_ant, &rx_ant);
@@ -1107,7 +1108,9 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info)if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX ] && info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX ]) {u32 tx_ant, rx_ant; -if (!rdev->wiphy.available_antennas || !rdev->ops->set_antenna) { +if ((!rdev->wiphy.available_antennas_tx && + !rdev->wiphy.available_antennas_rx) || + !rdev->ops->set_antenna) { result = -EOPNOTSUPP ; goto bad_res; }
@@ -1116,15 +1119,15 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) rx_ant =nla_get_u32 (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX ]);/* reject antenna configurations which don't match the -* available antenna mask, except for the "all" mask */ -if ((~tx_ant && (tx_ant & ~rdev->wiphy.available_antennas)) || - (~rx_ant && (rx_ant & ~rdev->wiphy.available_antennas))) { +* available antenna masks, except for the "all" mask */ +if ((~tx_ant && (tx_ant & ~rdev->wiphy.available_antennas_tx)) || + (~rx_ant && (rx_ant & ~rdev->wiphy.available_antennas_rx))) { result = -EINVAL ; goto bad_res; } - tx_ant = tx_ant & rdev->wiphy.available_antennas; - rx_ant = rx_ant & rdev->wiphy.available_antennas; + tx_ant = tx_ant & rdev->wiphy.available_antennas_tx; + rx_ant = rx_ant & rdev->wiphy.available_antennas_rx; result = rdev->ops->set_antenna (&rdev->wiphy, tx_ant, rx_ant);if (result)
PATCH 2/3 nl80211: Export available antennas
Export the information which antennas are available for configuration as TX or RX antennas via nl80211.
Signed-off-by Bruno Randolf <[email protected]>
---
v3: rebased and updated for separate RX and TX availablility
v2: rebased
--- include/linux/nl80211.h | 9 +++++++++ net/wireless/nl80211.c | 5 +++++ 2 files changed, 14 insertions(+), 0 deletions(-)
include/linux/nl80211.h +9 -0
@@ -844,6 +844,12 @@ enum nl80211_commands {* the hardware should not be configured to receive on this antenna. * For a more detailed descripton see @NL80211_ATTR_WIPHY_ANTENNA_TX. * +* @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX: Bitmap of antennas which are available +* for configuration as TX antennas via the above parameters. +* +* @NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX: Bitmap of antennas which are available +* for configuration as RX antennas via the above parameters. +* * @NL80211_ATTR_MCAST_RATE: Multicast tx rate (in 100 kbps) for IBSS * * @NL80211_ATTR_OFFCHANNEL_TX_OK: For management frame TX, the frame may be
@@ -1040,6 +1046,9 @@ enum nl80211_attrs {NL80211_ATTR_MAX_REMAIN_ON_CHANNEL_DURATION , +NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX , +NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
net/wireless/nl80211.c +5 -0
@@ -605,6 +605,11 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,if (dev->wiphy.flags &WIPHY_FLAG_CONTROL_PORT_PROTOCOL )NLA_PUT_FLAG (msg,NL80211_ATTR_CONTROL_PORT_ETHERTYPE ); +NLA_PUT_U32 (msg,NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX , + dev->wiphy.available_antennas_tx); +NLA_PUT_U32 (msg,NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX , + dev->wiphy.available_antennas_rx); +if ((dev->wiphy.available_antennas_tx || dev->wiphy.available_antennas_rx) && dev->ops->get_antenna) {u32 tx_ant =0 , rx_ant =0 ;
PATCH 3/3 ath5k: Set available antenna information for cfg80211
In reply to Bruno RandolfSigned-off-by Bruno Randolf <[email protected]>
---
v3: rebased and updated for separate RX and TX availability
v2: rebased
--- drivers/net/wireless/ath/ath5k/base.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +4 -0
@@ -2351,6 +2351,10 @@ ath5k_init_softc(struct ath5k_softc *sc, const struct ath_bus_ops *bus_ops)BIT (NL80211_IFTYPE_ADHOC ) |BIT (NL80211_IFTYPE_MESH_POINT ); +/* both antennas can be configured as RX or TX */ + hw->wiphy->available_antennas_tx =0x3 ; + hw->wiphy->available_antennas_rx =0x3 ; + hw->extra_tx_headroom =2 ; hw->channel_change_time =5000 ;