cfg80211: Add antenna availability information
PATCH v2 1/1 cfg80211: Add antenna availability information
Add a field to wiphy for the hardware to report the availble antennas for configuration. Only if this is set to something bigger than zero, will the anntenna configuration ops be executed.
Allthough this could be a simple number of antennas, I defined it as a bitmap of antennas which are available for configuration, since it's more consistent with the rest of the antenna API and there could be cases where the hardware allows only configuration of certain antennas. As it does not make much of a difference in size or normal usage, I think it's better to be able to support this, in case the need arises.
The antenna configuration is now also checked against the availabe antennas and rejected if it does not match.
v2: reject antenna configurations which don't match the available antennas
--- include/net/cfg80211.h | 5 +++++ net/wireless/nl80211.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)
include/net/cfg80211.h +5 -0
@@ -1465,6 +1465,9 @@ struct ieee80211_txrx_stypes {* @mgmt_stypes: bitmasks of frame subtypes that can be subscribed to or * 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. */ struct wiphy {/* assign these fields before you register the wiphy */
@@ -1504,6 +1507,8 @@ struct wiphy {u8 max_num_pmkids; +u32 available_antennas; +/* If multiple wiphys are registered and you're handed e.g. * a regular netdev with assigned ieee80211_ptr, you won't * know whether it points to a wiphy your driver has registered
net/wireless/nl80211.c +10 -2
@@ -547,7 +547,7 @@ 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->ops->get_antenna) { +if (dev->wiphy.available_antennas && dev->ops->get_antenna) {u32 tx_ant =0 , rx_ant =0 ;int res; res = dev->ops->get_antenna (&dev->wiphy, &tx_ant, &rx_ant);
@@ -1045,7 +1045,7 @@ 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->ops->set_antenna) { +if (!rdev->wiphy.available_antennas || !rdev->ops->set_antenna) { result = -EOPNOTSUPP ; goto bad_res; }
@@ -1053,6 +1053,14 @@ static int nl80211_set_wiphy(struct sk_buff *skb, struct genl_info *info) tx_ant =nla_get_u32 (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX ]); 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))) { + result = -EINVAL ; + goto bad_res; + } + result = rdev->ops->set_antenna (&rdev->wiphy, tx_ant, rx_ant);if (result) goto bad_res;
Ah, please ignore this one and wait for v3...
bruno
Quoted 32 lines · On Wed December 8 2010 12:44:29 Bruno Randolf wrote:
Add a field to wiphy for the hardware to report the availble antennas for configuration. Only if this is set to something bigger than zero, will the anntenna configuration ops be executed.
Allthough this could be a simple number of antennas, I defined it as a bitmap of antennas which are available for configuration, since it's more consistent with the rest of the antenna API and there could be cases where the hardware allows only configuration of certain antennas. As it does not make much of a difference in size or normal usage, I think it's better to be able to support this, in case the need arises.
The antenna configuration is now also checked against the availabe antennas and rejected if it does not match.
Signed-off-by Bruno Randolf <[email protected]>v2: reject antenna configurations which don't match the available antennas
--- include/net/cfg80211.h | 5 +++++ net/wireless/nl80211.c | 12 ++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-)include/net/cfg80211.h +2
-0@@ -1465,6 +1465,9 @@ struct ieee80211_txrx_stypes {* @mgmt_stypes: bitmasks of frame subtypes that can be subscribed to or * transmitted through nl80211, points to an array indexed by interface * type +* +* @available_antennas: bitmap of antennas which are available to
Quoted 1 line
configure. + * antenna configuration commands will be rejected unless
this
Quoted 56 lines
is set. */
struct wiphy {include/net/cfg80211.h +2
-0/* assign these fields before you register the wiphy */ @@ -1504,6 +1507,8 @@ struct wiphy {u8 max_num_pmkids; +u32 available_antennas; +/* If multiple wiphys are registered and you're handed e.g. * a regular netdev with assigned ieee80211_ptr, you won't * know whether it points to a wiphy your driver has registered net/wireless/nl80211.c +0
-0@@ -547,7 +547,7 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32pid, u32 seq, int flags, if (
dev->wiphy.flags&WIPHY_FLAG_CONTROL_PORT_PROTOCOL)net/wireless/nl80211.c +1
-1NLA_PUT_FLAG (msg,NL80211_ATTR_CONTROL_PORT_ETHERTYPE ); -if (dev->ops->get_antenna) { +if (dev->wiphy.available_antennas && dev->ops->get_antenna) {u32 tx_ant =0 , rx_ant =0 ;int res; res = dev->ops->get_antenna (&dev->wiphy, &tx_ant, &rx_ant);@@ -1045,7 +1045,7 @@ static int nl80211_set_wiphy(struct sk_buff *skb,struct
genl_info*info) if (info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX] &&net/wireless/nl80211.c +1
-1info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]) {u32 tx_ant, rx_ant; -if (!rdev->ops->set_antenna) { +if (!rdev->wiphy.available_antennas || !rdev->ops->set_antenna) { result = -EOPNOTSUPP ; goto bad_res; }@@ -1053,6 +1053,14 @@ static int nl80211_set_wiphy(struct sk_buff *skb,struct
genl_info*info)tx_ant=nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_ANTENNA_TX]);rx_ant=nla_get_u32(info->attrs[NL80211_ATTR_WIPHY_ANTENNA_RX]);net/wireless/nl80211.c +8
-1+/* 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))) { + result = -EINVAL ; + goto bad_res; + } + result = rdev->ops->set_antenna (&rdev->wiphy, tx_ant, rx_ant);if (result) goto bad_res; --To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 11 lines · Bruno Randolf
Add a field to wiphy for the hardware to report the availble antennas for configuration. Only if this is set to something bigger than zero, will the anntenna configuration ops be executed.
Allthough this could be a simple number of antennas, I defined it as a bitmap of antennas which are available for configuration, since it's more consistent with the rest of the antenna API and there could be cases where the hardware allows only configuration of certain antennas. As it does not make much of a difference in size or normal usage, I think it's better to be able to support this, in case the need arises.
Quoted 7 lines
The antenna configuration is now also checked against the availabe antennas and rejected if it does not match.
Signed-off-by Bruno Randolf <[email protected]>v2: reject antenna configurations which don't match the available antennas
---
Please either put the "v2" part before the "Signed-off-by" or (preferably) after the "---" line. Also, make sure to use 3 "-" characters -- often you use only 2 of them and the results from applying with "git am" are messy.
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
Quoted 17 lines · On Wednesday 08 December 2010 23:31:01 John W. Linville wrote:
Quoted 16 lines · Bruno Randolf
Add a field to wiphy for the hardware to report the availble antennas for configuration. Only if this is set to something bigger than zero, will the anntenna configuration ops be executed.
Allthough this could be a simple number of antennas, I defined it as a bitmap of antennas which are available for configuration, since it's more consistent with the rest of the antenna API and there could be cases where the hardware allows only configuration of certain antennas. As it does not make much of a difference in size or normal usage, I think it's better to be able to support this, in case the need arises.
The antenna configuration is now also checked against the availabe antennas and rejected if it does not match.
Signed-off-by Bruno Randolf <[email protected]>
Quoted 7 lines
Quoted 2 lines
v2: reject antenna configurations which don't match the available
antennas ---Please either put the "v2" part before the "Signed-off-by" or (preferably) after the "---" line. Also, make sure to use 3 "-" characters -- often you use only 2 of them and the results from applying with "git am" are messy.
Oh, I'm sorry for that. For some reason I thought 2 -- are ok. Will be careful to have three from now on.
bruno