3 @@ -146,7 +146,7 @@ void print_ht_capability(__u16 cap);
5 const char *iftype_name(enum nl80211_iftype iftype);
6 const char *command_name(enum nl80211_commands cmd);
7 -int ieee80211_channel_to_frequency(int chan);
8 +int ieee80211_channel_to_frequency(int chan, enum nl80211_band band);
9 int ieee80211_frequency_to_channel(int freq);
11 void print_ssid_escaped(const uint8_t len, const uint8_t *data);
14 @@ -66,8 +66,12 @@ static int handle_freqchan(struct nl_msg
19 - freq = ieee80211_channel_to_frequency(freq);
21 + enum nl80211_band band;
22 + band = freq <= 14 ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
23 + freq = ieee80211_channel_to_frequency(freq, band);
27 NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
28 NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, htval);
31 @@ -248,31 +248,37 @@ const char *command_name(enum nl80211_co
35 -int ieee80211_channel_to_frequency(int chan)
36 +int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
39 - return 2407 + chan * 5;
44 - /* FIXME: dot11ChannelStartingFactor (802.11-2007 17.3.8.3.2) */
45 - return (chan + 1000) * 5;
46 + /* see 802.11-2007 17.3.8.3.2 and Annex J
47 + * there are overlapping channel numbers in 5GHz and 2GHz bands */
48 + if (band == NL80211_BAND_5GHZ) {
49 + if (chan >= 182 && chan <= 196)
50 + return 4000 + chan * 5;
52 + return 5000 + chan * 5;
53 + } else { /* NL80211_BAND_2GHZ */
57 + return 2407 + chan * 5;
59 + return 0; /* not supported */
63 int ieee80211_frequency_to_channel(int freq)
65 + /* see 802.11-2007 17.3.8.3.2 and Annex J */
70 + else if (freq < 2484)
71 return (freq - 2407) / 5;
73 - /* FIXME: dot11ChannelStartingFactor (802.11-2007 17.3.8.3.2) */
75 - return freq/5 - 1000;
77 - if (freq >= 58320 && freq <= 64800)
78 + else if (freq >= 4910 && freq <= 4980)
79 + return (freq - 4000) / 5;
80 + else if (freq < 45000)
81 + return (freq - 5000) / 5;
82 + else if (freq >= 58320 && freq <= 64800)
83 return (freq - 56160) / 2160;