2011-01-26 11:33:58 +00:00
|
|
|
iw: Add antenna configuration commands
|
|
|
|
|
|
|
|
From: Bruno Randolf <br1@einfach.org>
|
|
|
|
|
|
|
|
Add command to set the antenna configuration (iw phyX set antenna ...) and
|
|
|
|
include antenna setting in wiphy information (iw phyX info).
|
|
|
|
|
|
|
|
iw phyX set antenna all | <bitmap> | <tx bitmap> <rx bitmap>
|
|
|
|
|
|
|
|
Signed-off-by: Bruno Randolf <br1@einfach.org>
|
|
|
|
|
|
|
|
v8: Simplfied option parser as requested.
|
|
|
|
---
|
|
|
|
info.c | 7 +++++++
|
|
|
|
phy.c | 39 +++++++++++++++++++++++++++++++++++++++
|
|
|
|
2 files changed, 46 insertions(+), 0 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/info.c b/info.c
|
|
|
|
index ce85514..75cadf0 100644
|
|
|
|
--- a/info.c
|
|
|
|
+++ b/info.c
|
|
|
|
@@ -168,6 +168,13 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
|
|
|
|
printf("\tCoverage class: %d (up to %dm)\n", coverage, 450 * coverage);
|
|
|
|
}
|
|
|
|
|
|
|
|
+ if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
|
|
|
|
+ tb_msg[NL80211_ATTR_WIPHY_ANTENNA_RX]) {
|
|
|
|
+ printf("\tAntenna: TX %#x RX %#x\n",
|
|
|
|
+ nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_ANTENNA_TX]),
|
|
|
|
+ nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_ANTENNA_RX]));
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
if (tb_msg[NL80211_ATTR_SUPPORTED_IFTYPES]) {
|
|
|
|
printf("\tSupported interface modes:\n");
|
|
|
|
nla_for_each_nested(nl_mode, tb_msg[NL80211_ATTR_SUPPORTED_IFTYPES], rem_mode)
|
|
|
|
diff --git a/phy.c b/phy.c
|
|
|
|
index 7c6c7c8..e3bd4e8 100644
|
|
|
|
--- a/phy.c
|
|
|
|
+++ b/phy.c
|
2011-01-27 08:47:31 +00:00
|
|
|
@@ -307,3 +307,51 @@ COMMAND(set, txpower, "<auto|fixed|limit> [<tx power in mBm>]",
|
2011-01-26 11:33:58 +00:00
|
|
|
COMMAND(set, txpower, "<auto|fixed|limit> [<tx power in mBm>]",
|
|
|
|
NL80211_CMD_SET_WIPHY, 0, CIB_NETDEV, handle_txpower,
|
|
|
|
"Specify transmit power level and setting type.");
|
|
|
|
+
|
|
|
|
+static int handle_antenna(struct nl80211_state *state,
|
|
|
|
+ struct nl_cb *cb,
|
|
|
|
+ struct nl_msg *msg,
|
|
|
|
+ int argc, char **argv)
|
|
|
|
+{
|
|
|
|
+ char *end;
|
|
|
|
+ uint32_t tx_ant = 0, rx_ant = 0;
|
|
|
|
+
|
2011-01-27 08:47:31 +00:00
|
|
|
+ if (argc == 1) {
|
|
|
|
+ if (strcmp(argv[0], "all") == 0)
|
|
|
|
+ tx_ant = rx_ant = 0xffffffff;
|
|
|
|
+ else {
|
|
|
|
+ tx_ant = rx_ant = strtoul(argv[0], &end, 0);
|
|
|
|
+ if (*end)
|
|
|
|
+ return 1;
|
|
|
|
+ }
|
2011-01-26 11:33:58 +00:00
|
|
|
+ }
|
|
|
|
+ else if (argc == 2) {
|
2011-01-27 08:47:31 +00:00
|
|
|
+ if (strcmp(argv[0], "all") == 0)
|
|
|
|
+ tx_ant = 0xffffffff;
|
|
|
|
+ else {
|
|
|
|
+ tx_ant = strtoul(argv[0], &end, 0);
|
|
|
|
+ if (*end)
|
|
|
|
+ return 1;
|
|
|
|
+ }
|
|
|
|
+ if (strcmp(argv[1], "all") == 0)
|
|
|
|
+ rx_ant = 0xffffffff;
|
|
|
|
+ else {
|
|
|
|
+ rx_ant = strtoul(argv[1], &end, 0);
|
|
|
|
+ if (*end)
|
|
|
|
+ return 1;
|
|
|
|
+ }
|
2011-01-26 11:33:58 +00:00
|
|
|
+ } else
|
|
|
|
+ return 1;
|
|
|
|
+
|
|
|
|
+ NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_ANTENNA_TX, tx_ant);
|
|
|
|
+ NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_ANTENNA_RX, rx_ant);
|
|
|
|
+
|
|
|
|
+ return 0;
|
|
|
|
+
|
|
|
|
+ nla_put_failure:
|
|
|
|
+ return -ENOBUFS;
|
|
|
|
+}
|
|
|
|
+COMMAND(set, antenna, "<bitmap> | all | <tx bitmap> <rx bitmap>",
|
|
|
|
+ NL80211_CMD_SET_WIPHY, 0, CIB_PHY, handle_antenna,
|
|
|
|
+ "Set a bitmap of allowed antennas to use for TX and RX.\n"
|
|
|
|
+ "The driver may reject antenna configurations it cannot support.");
|