diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-26 11:33:58 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-26 11:33:58 +0000 |
commit | fedce2a94df014ad03a010842fba9cae4dca5933 (patch) | |
tree | b644531767a45a6176d3e3648705c1d2ea6e60aa | |
parent | 9eacd21000c25da72cd5d6938a38a1e1106ca384 (diff) |
iw: Add support for antenna configuration commands
Patch from: kentarou matsuyama <matsuyama@thinktube.com>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25106 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | package/iw/patches/401-antenna.patch | 82 |
1 files changed, 82 insertions, 0 deletions
diff --git a/package/iw/patches/401-antenna.patch b/package/iw/patches/401-antenna.patch new file mode 100644 index 0000000000..660f79f67f --- /dev/null +++ b/package/iw/patches/401-antenna.patch @@ -0,0 +1,82 @@ +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 +@@ -307,3 +307,42 @@ COMMAND(set, txpower, "<auto|fixed|limit> [<tx power in mBm>]", + 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; ++ ++ if (argc == 1 && strcmp(argv[0], "all") == 0) { ++ tx_ant = 0xffffffff; ++ rx_ant = 0xffffffff; ++ } else if (argc == 1) { ++ tx_ant = rx_ant = strtoul(argv[0], &end, 0); ++ if (*end) ++ return 1; ++ } ++ else if (argc == 2) { ++ tx_ant = strtoul(argv[0], &end, 0); ++ if (*end) ++ return 1; ++ rx_ant = strtoul(argv[1], &end, 0); ++ if (*end) ++ return 1; ++ } 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."); |