diff options
author | David S. Miller <davem@davemloft.net> | 2009-01-29 15:27:47 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-01-29 15:27:47 -0800 |
commit | ae9e47e9e864bc5f0a7a7e71dc3f287196b3626b (patch) | |
tree | 08aac6bd0b77fb8a3936f120e87574cb32459d2d /net | |
parent | a4e6db07984529847c6ad8bc616485e721dcb809 (diff) | |
parent | be0093705c3ce98d73cac0ca8f93ea105cdf4e9c (diff) | |
download | kernel_samsung_smdk4412-ae9e47e9e864bc5f0a7a7e71dc3f287196b3626b.tar.gz kernel_samsung_smdk4412-ae9e47e9e864bc5f0a7a7e71dc3f287196b3626b.tar.bz2 kernel_samsung_smdk4412-ae9e47e9e864bc5f0a7a7e71dc3f287196b3626b.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/reg.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index bc494cef210..85c9034c59b 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c @@ -498,6 +498,7 @@ static struct ieee80211_regdomain *country_ie_2_rd( * calculate the number of reg rules we will need. We will need one * for each channel subband */ while (country_ie_len >= 3) { + int end_channel = 0; struct ieee80211_country_ie_triplet *triplet = (struct ieee80211_country_ie_triplet *) country_ie; int cur_sub_max_channel = 0, cur_channel = 0; @@ -509,9 +510,25 @@ static struct ieee80211_regdomain *country_ie_2_rd( continue; } + /* 2 GHz */ + if (triplet->chans.first_channel <= 14) + end_channel = triplet->chans.first_channel + + triplet->chans.num_channels; + else + /* + * 5 GHz -- For example in country IEs if the first + * channel given is 36 and the number of channels is 4 + * then the individual channel numbers defined for the + * 5 GHz PHY by these parameters are: 36, 40, 44, and 48 + * and not 36, 37, 38, 39. + * + * See: http://tinyurl.com/11d-clarification + */ + end_channel = triplet->chans.first_channel + + (4 * (triplet->chans.num_channels - 1)); + cur_channel = triplet->chans.first_channel; - cur_sub_max_channel = ieee80211_channel_to_frequency( - cur_channel + triplet->chans.num_channels); + cur_sub_max_channel = end_channel; /* Basic sanity check */ if (cur_sub_max_channel < cur_channel) @@ -590,15 +607,6 @@ static struct ieee80211_regdomain *country_ie_2_rd( end_channel = triplet->chans.first_channel + triplet->chans.num_channels; else - /* - * 5 GHz -- For example in country IEs if the first - * channel given is 36 and the number of channels is 4 - * then the individual channel numbers defined for the - * 5 GHz PHY by these parameters are: 36, 40, 44, and 48 - * and not 36, 37, 38, 39. - * - * See: http://tinyurl.com/11d-clarification - */ end_channel = triplet->chans.first_channel + (4 * (triplet->chans.num_channels - 1)); @@ -1276,7 +1284,7 @@ static void reg_country_ie_process_debug( if (intersected_rd) { printk(KERN_DEBUG "cfg80211: We intersect both of these " "and get:\n"); - print_regdomain_info(rd); + print_regdomain_info(intersected_rd); return; } printk(KERN_DEBUG "cfg80211: Intersection between both failed\n"); |