iw: Add antenna configuration

Add command to set the antenna configuration (iw phyX set antenna ...) and
include available antennas and antenna setting in wiphy information.

iw phyX info:
        Available Antennas: TX 0x3 RX 0x3
        Configured Antennas: TX 0x1 RX 0x1

iw phyX set antenna <bitmap> | all | <tx bitmap> <rx bitmap>

Signed-off-by: Bruno Randolf <br1@einfach.org>

diff --git a/info.c b/info.c
index 0783701a16a344ff997e7bf39d2e3ad192af5bf7..de4777f1d25759f51e9ed109cde958bc21c68bb9 100644 (file)
--- a/info.c
+++ b/info.c
@@ -168,6 +168,18 @@ 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_AVAIL_TX] &&
+           tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
+               printf("\tAvailable Antennas: TX %#x RX %#x\n",
+                      nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX]),
+                      nla_get_u32(tb_msg[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX]));
+
+       if (tb_msg[NL80211_ATTR_WIPHY_ANTENNA_TX] &&
+           tb_msg[NL80211_ATTR_WIPHY_ANTENNA_RX])
+               printf("\tConfigured Antennas: 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 7c6c7c8146db73640b4869d0161bdc3755e5ac49..e3bd4e8bf54a64edb2d2a4c202c02bb014649541 100644 (file)
--- 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.");