nl80211: Export available antennas
PATCH 1/2 nl80211: Export available antennas
---
v2: rebased
--- include/linux/nl80211.h | 5 +++++ net/wireless/nl80211.c | 2 ++ 2 files changed, 7 insertions(+), 0 deletions(-)
include/linux/nl80211.h +5 -0
@@ -841,6 +841,9 @@ 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: Bitmap of antennas which are available for +* configuration 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
@@ -1035,6 +1038,8 @@ enum nl80211_attrs {NL80211_ATTR_KEY_DEFAULT_TYPES , +NL80211_ATTR_WIPHY_ANTENNA_AVAIL , +/* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST,
net/wireless/nl80211.c +2 -0
@@ -613,6 +613,8 @@ static int nl80211_send_wiphy(struct sk_buff *msg, u32 pid, u32 seq, int flags,NLA_PUT_U32 (msg,NL80211_ATTR_WIPHY_ANTENNA_TX , tx_ant);NLA_PUT_U32 (msg,NL80211_ATTR_WIPHY_ANTENNA_RX , rx_ant); } +NLA_PUT_U32 (msg,NL80211_ATTR_WIPHY_ANTENNA_AVAIL , + dev->wiphy.available_antennas); } nl_modes =nla_nest_start (msg,NL80211_ATTR_SUPPORTED_IFTYPES );
PATCH 2/2 ath5k: Set available antenna information for cfg80211
---
v2: rebased
--- drivers/net/wireless/ath/ath5k/base.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/wireless/ath/ath5k/base.c +2 -0
@@ -2351,6 +2351,8 @@ ath5k_init_softc(struct ath5k_softc *sc, const struct ath_bus_ops *bus_ops)BIT (NL80211_IFTYPE_ADHOC ) |BIT (NL80211_IFTYPE_MESH_POINT ); + hw->wiphy->available_antennas =0x3 ;/* both can be configured */ + hw->extra_tx_headroom =2 ; hw->channel_change_time =5000 ;
Quoted 15 lines · Bruno Randolf
Signed-off-by Bruno Randolf <[email protected]>---
v2: rebased
---
include/linux/nl80211.h | 5 +++++
net/wireless/nl80211.c | 2 ++2 files changed, 7 insertions(+), 0 deletions(-)include/linux/nl80211.h +0
-0
include/linux/nl80211.h enum nl80211_commands { · line 846
Quoted 6 lines
include/linux/nl80211.h +3
-0@@ -841,6 +841,9 @@ 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: Bitmap of antennas which are available for + * configuration via the above parameters. + *
Not clear exactly what the point of this is -- there's no commit message -- but should not this API distinguish between TX and RX? E.g., several chipsets can only TX from a subset of RX antennas.
Dan
Quoted 7 lines · On Tue December 14 2010 11:23:09 Daniel Halperin wrote:
Quoted 7 lines
include/linux/nl80211.h +0
-0@@ -841,6 +841,9 @@ 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.
Quoted 8 lines
Quoted 4 lines
include/linux/nl80211.h +1
-0* +* @NL80211_ATTR_WIPHY_ANTENNA_AVAIL: Bitmap of antennas which are available for + * configuration via the above parameters.
+ *Not clear exactly what the point of this is -- there's no commit message -- but should not this API distinguish between TX and RX? E.g., several chipsets can only TX from a subset of RX antennas.
This is just the nl80211 part of a patch that got merged earlier, the description of which has more info:
https://patchwork.kernel.org/patch/389682/
If it's necessary to distinguish between RX and TX it has to be done there too. Can you give us examples of these chipsets which you mentioned?
bruno
Several of the Intel ones, I believe. For instance 4965 can RX with 3 antennas but can maybe only TX with A and B? Intel also has a 1x2 (5100 maybe?) chipset.
Dan
Quoted 27 lines · Bruno Randolf
Quoted 7 lines · On Tue December 14 2010 11:23:09 Daniel Halperin wrote:
Quoted 7 lines
include/linux/nl80211.h +0
-0@@ -841,6 +841,9 @@ 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.Quoted 8 lines
Quoted 4 lines
include/linux/nl80211.h +1
-0* + * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL: Bitmap of antennas which areavailable for + * configuration via the above parameters.
+ *Not clear exactly what the point of this is -- there's no commit message -- but should not this API distinguish between TX and RX? E.g., several chipsets can only TX from a subset of RX antennas.
This is just the nl80211 part of a patch that got merged earlier, the description of which has more info:
https://patchwork.kernel.org/patch/389682/
If it's necessary to distinguish between RX and TX it has to be done there too. Can you give us examples of these chipsets which you mentioned?
bruno
Quoted 3 lines · On Tue December 14 2010 12:11:52 Daniel Halperin wrote:
Several of the Intel ones, I believe. For instance 4965 can RX with 3 antennas but can maybe only TX with A and B? Intel also has a 1x2 (5100 maybe?) chipset.
A lot of maybees ;) Can anyone else comment? Do we need available antennas separately for RX and TX?
bruno
Quoted 28 lines · Bruno Randolf
Quoted 27 lines · On Tue December 14 2010 11:23:09 Daniel Halperin wrote:
Quoted 7 lines
Quoted 7 lines
include/linux/nl80211.h +0
-0@@ -841,6 +841,9 @@ enum nl80211_commands {* the hardware should not be configured to receive on this antenna. * For a more detailed descripton see
Quoted 8 lines
Quoted 4 lines
@NL80211_ATTR_WIPHY_ANTENNA_TX. *
+ * @NL80211_ATTR_WIPHY_ANTENNA_AVAIL: Bitmap of antennas which are
available for + * configuration via the above parameters.
+ *Not clear exactly what the point of this is -- there's no commit message -- but should not this API distinguish between TX and RX? E.g., several chipsets can only TX from a subset of RX antennas.
This is just the nl80211 part of a patch that got merged earlier, the description of which has more info:
https://patchwork.kernel.org/patch/389682/
If it's necessary to distinguish between RX and TX it has to be done there too. Can you give us examples of these chipsets which you mentioned?
bruno
Quoted 8 lines · Bruno Randolf
Quoted 3 lines · On Tue December 14 2010 12:11:52 Daniel Halperin wrote:
Several of the Intel ones, I believe. For instance 4965 can RX with 3 antennas but can maybe only TX with A and B? Intel also has a 1x2 (5100 maybe?) chipset.
A lot of maybees ;) Can anyone else comment? Do we need available antennas separately for RX and TX?
Sorry, I thought I had given you enough info to figure it out for yourself. Since you're incapable, here's the exact pointer:
That's one instance, there are many others. Atheros also makes chipsets like this, and I suspect others do too.
Dan