package/network/utils/iw/patches/140-freq-11j.patch

   1 --- a/iw.h
   2 +++ b/iw.h
   3 @@ -146,7 +146,7 @@ void print_ht_capability(__u16 cap);
   4
   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);
  10
  11  void print_ssid_escaped(const uint8_t len, const uint8_t *data);
  12 --- a/phy.c
  13 +++ b/phy.c
  14 @@ -66,8 +66,12 @@ static int handle_freqchan(struct nl_msg
  15         if (*end)
  16                 return 1;
  17
  18 -       if (chan)
  19 -               freq = ieee80211_channel_to_frequency(freq);
  20 +       if (chan) {
  21 +               enum nl80211_band band;
  22 +               band = freq <= 14 ? NL80211_BAND_2GHZ : NL80211_BAND_5GHZ;
  23 +               freq = ieee80211_channel_to_frequency(freq, band);
  24 +       }
  25 +
  26
  27         NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_FREQ, freq);
  28         NLA_PUT_U32(msg, NL80211_ATTR_WIPHY_CHANNEL_TYPE, htval);
  29 --- a/util.c
  30 +++ b/util.c
  31 @@ -248,31 +248,37 @@ const char *command_name(enum nl80211_co
  32         return cmdbuf;
  33  }
  34
  35 -int ieee80211_channel_to_frequency(int chan)
  36 +int ieee80211_channel_to_frequency(int chan, enum nl80211_band band)
  37  {
  38 -       if (chan < 14)
  39 -               return 2407 + chan * 5;
  40 -
  41 -       if (chan == 14)
  42 -               return 2484;
  43 -
  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;
  51 +               else
  52 +                       return 5000 + chan * 5;
  53 +       } else { /* NL80211_BAND_2GHZ */
  54 +               if (chan == 14)
  55 +                       return 2484;
  56 +               else if (chan < 14)
  57 +                       return 2407 + chan * 5;
  58 +               else
  59 +                       return 0; /* not supported */
  60 +       }
  61  }
  62
  63  int ieee80211_frequency_to_channel(int freq)
  64  {
  65 +       /* see 802.11-2007 17.3.8.3.2 and Annex J */
  66         if (freq == 2484)
  67                 return 14;
  68 -
  69 -       if (freq < 2484)
  70 +       else if (freq < 2484)
  71                 return (freq - 2407) / 5;
  72 -
  73 -       /* FIXME: dot11ChannelStartingFactor (802.11-2007 17.3.8.3.2) */
  74 -       if (freq < 45000)
  75 -               return freq/5 - 1000;
  76 -
  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;
  84
  85         return 0;