Changeset 17529

Timestamp:

08/30/11 00:23:53 (21 months ago)

Author:

chris

Message:

mac80211 get/set antennas with ap83 correction

Location:

src/router

Files:

• libutils/mac80211info.c (modified) (1 diff)
• shared/wlutils.h (modified) (1 diff)

src/router/libutils/mac80211info.c

@@ -738 +738 @@
         return 0;
 }
+
+void mac80211_set_antennas(int phy,uint32_t tx_ant,uint32_t rx_ant ) {
+        struct nl_msg *msg;
+
+        msg = unl_genl_msg(&unl, NL80211_CMD_SET_WIPHY, false);
+        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, phy);
+#ifdef HAVE_AP83
+        if (tx_ant == 5) tx_ant=3;
+#endif
+        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_ANTENNA_TX, tx_ant);
+        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_ANTENNA_RX, rx_ant);
+        unl_genl_request(&unl, msg, NULL, NULL);
+        return;
+
+nla_put_failure:
+        nlmsg_free(msg);
+        return;
+}
+
+static int mac80211_get_antennas(int phy,int which,int direction) {
+        struct nlattr *tb[NL80211_ATTR_MAX + 1];
+        struct nl_msg *msg;
+        struct genlmsghdr *gnlh;
+
+        msg = unl_genl_msg(&unl, NL80211_CMD_GET_WIPHY, true);
+        NLA_PUT_U32(msg, NL80211_ATTR_WIPHY, phy);
+        if (unl_genl_request_single(&unl, msg, &msg) < 0)
+                return 0;
+        gnlh=nlmsg_data(nlmsg_hdr(msg));
+        nla_parse(tb, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
+                  genlmsg_attrlen(gnlh, 0), NULL);
+        if (which == 0 && direction == 0) {
+                if (tb[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX])
+                     return((int) nla_get_u32(tb[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_TX]));
+        }
+
+        if (which == 0 && direction == 1) {
+                if (tb[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX])
+                     return((int) nla_get_u32(tb[NL80211_ATTR_WIPHY_ANTENNA_AVAIL_RX]));
+        }
+
+        if (which == 1 && direction == 0) {
+                if (tb[NL80211_ATTR_WIPHY_ANTENNA_TX])
+                     return((int) nla_get_u32(tb[NL80211_ATTR_WIPHY_ANTENNA_TX]));
+        }
+
+        if (which == 1 && direction == 1) {
+                if (tb[NL80211_ATTR_WIPHY_ANTENNA_RX])
+                     return((int) nla_get_u32(tb[NL80211_ATTR_WIPHY_ANTENNA_RX]));
+        }
+        nlmsg_free(msg);
+        return 0;
+nla_put_failure:
+        nlmsg_free(msg);
+        return 0;
+}
+
+int mac80211_get_avail_tx_antenna(int phy) {
+        int ret=mac80211_get_antennas(phy,0,0);
+#ifdef HAVE_AP83
+        if (ret == 3) ret=5;
+#endif
+        return(ret);
+        }
+
+int mac80211_get_avail_rx_antenna(int phy) {
+        return(mac80211_get_antennas(phy,0,1));
+        }
+
+int mac80211_get_configured_tx_antenna(int phy) {
+        int ret=mac80211_get_antennas(phy,1,0);
+#ifdef HAVE_AP83
+        if (ret == 3) ret=5;
+#endif
+        return(ret);
+        }
+
+int mac80211_get_configured_rx_antenna(int phy) {
+        return(mac80211_get_antennas(phy,1,1));
+        }

src/router/shared/wlutils.h

@@ -108 +108 @@
 struct wifi_channels *mac80211_get_channels(char *interface,char *country,int max_bandwidth_khz, unsigned char checkband);
 extern struct mac80211_ac *mac80211autochannel(char *interface, char *freq_range, int scans, int ammount, int enable_passive);
+extern void mac80211_set_antennas(int phy,uint32_t tx_ant,uint32_t rx_ant );
+extern int mac80211_get_avail_tx_antenna(int phy);
+extern int mac80211_get_avail_rx_antenna(int phy);
+extern int mac80211_get_configured_tx_antenna(int phy);
+extern int mac80211_get_configured_rx_antenna(int phy);
 
 struct wifi_channels {