iw: add support for 5 and 10 MHz channels in IBSS mode

[thirdparty/iw.git] / util.c

diff --git a/util.c b/util.c
index c272c1dae9e3ad5b80415fa30c3da4ed893a3283..4542749a18bdd66d67fd79c08b26b57ca0c85f7d 100644 (file)
--- a/util.c
+++ b/util.c
@@ -240,6 +240,14 @@ static const char *commands[NL80211_CMD_MAX + 1] = {
        [NL80211_CMD_START_P2P_DEVICE] = "start_p2p_device",
        [NL80211_CMD_STOP_P2P_DEVICE] = "stop_p2p_device",
        [NL80211_CMD_CONN_FAILED] = "conn_failed",
+       [NL80211_CMD_SET_MCAST_RATE] = "set_mcast_rate",
+       [NL80211_CMD_SET_MAC_ACL] = "set_mac_acl",
+       [NL80211_CMD_RADAR_DETECT] = "radar_detect",
+       [NL80211_CMD_GET_PROTOCOL_FEATURES] = "get_protocol_features",
+       [NL80211_CMD_UPDATE_FT_IES] = "update_ft_ies",
+       [NL80211_CMD_FT_EVENT] = "ft_event",
+       [NL80211_CMD_CRIT_PROTOCOL_START] = "crit_protocol_start",
+       [NL80211_CMD_CRIT_PROTOCOL_STOP] = "crit_protocol_stop",
 };
 
 static char cmdbuf[100];
@@ -252,34 +260,50 @@ const char *command_name(enum nl80211_commands cmd)
        return cmdbuf;
 }
 
-int ieee80211_channel_to_frequency(int chan)
+int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
 {
-       if (chan < 14)
-               return 2407 + chan * 5;
-
-       if (chan == 14)
-               return 2484;
-
-       /* FIXME: dot11ChannelStartingFactor (802.11-2007 17.3.8.3.2) */
-       return (chan + 1000) * 5;
+       /* see 802.11 17.3.8.3.2 and Annex J
+        * there are overlapping channel numbers in 5GHz and 2GHz bands */
+       if (chan <= 0)
+               return 0; /* not supported */
+       switch (band) {
+       case NL80211_BAND_2GHZ:
+               if (chan == 14)
+                       return 2484;
+               else if (chan < 14)
+                       return 2407 + chan * 5;
+               break;
+       case NL80211_BAND_5GHZ:
+               if (chan >= 182 && chan <= 196)
+                       return 4000 + chan * 5;
+               else
+                       return 5000 + chan * 5;
+               break;
+       case NL80211_BAND_60GHZ:
+               if (chan < 5)
+                       return 56160 + chan * 2160;
+               break;
+       default:
+               ;
+       }
+       return 0; /* not supported */
 }
 
 int ieee80211_frequency_to_channel(int freq)
 {
+       /* see 802.11-2007 17.3.8.3.2 and Annex J */
        if (freq == 2484)
                return 14;
-
-       if (freq < 2484)
+       else if (freq < 2484)
                return (freq - 2407) / 5;
-
-       /* FIXME: dot11ChannelStartingFactor (802.11-2007 17.3.8.3.2) */
-       if (freq < 45000)
-               return freq/5 - 1000;
-
-       if (freq >= 58320 && freq <= 64800)
+       else if (freq >= 4910 && freq <= 4980)
+               return (freq - 4000) / 5;
+       else if (freq <= 45000) /* DMG band lower limit */
+               return (freq - 5000) / 5;
+       else if (freq >= 58320 && freq <= 64800)
                return (freq - 56160) / 2160;
-
-       return 0;
+       else
+               return 0;
 }
 
 void print_ssid_escaped(const uint8_t len, const uint8_t *data)
@@ -566,7 +590,7 @@ void print_ht_mcs(const __u8 *mcs)
        unsigned int tx_max_num_spatial_streams, max_rx_supp_data_rate;
        bool tx_mcs_set_defined, tx_mcs_set_equal, tx_unequal_modulation;
 
-       max_rx_supp_data_rate = ((mcs[10] >> 8) & ((mcs[11] & 0x3) << 8));
+       max_rx_supp_data_rate = (mcs[10] & ((mcs[11] & 0x3) << 8));
        tx_mcs_set_defined = !!(mcs[12] & (1 << 0));
        tx_mcs_set_equal = !(mcs[12] & (1 << 1));
        tx_max_num_spatial_streams = ((mcs[12] >> 2) & 3) + 1;