diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-12 13:49:28 -0400 |
| commit | 8065248069097dddf9945acfb2081025e9618c16 (patch) | |
| tree | eddf3fb0372ba0f65c01382d386942ea8d18932d /drivers/net/wireless/ipw2x00 | |
| parent | e66a8ddff72e85605f2212a0ebc666c7e9116641 (diff) | |
| parent | b4838d12e1f3cb48c2489a0b08733b5dbf848297 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'drivers/net/wireless/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2200.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 4fcdac63a30..2b022571a85 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c | |||
| @@ -11507,9 +11507,9 @@ static int ipw_wdev_init(struct net_device *dev) | |||
| 11507 | rc = -ENOMEM; | 11507 | rc = -ENOMEM; |
| 11508 | goto out; | 11508 | goto out; |
| 11509 | } | 11509 | } |
| 11510 | /* translate geo->bg to a_band.channels */ | 11510 | /* translate geo->a to a_band.channels */ |
| 11511 | for (i = 0; i < geo->a_channels; i++) { | 11511 | for (i = 0; i < geo->a_channels; i++) { |
| 11512 | a_band->channels[i].band = IEEE80211_BAND_2GHZ; | 11512 | a_band->channels[i].band = IEEE80211_BAND_5GHZ; |
| 11513 | a_band->channels[i].center_freq = geo->a[i].freq; | 11513 | a_band->channels[i].center_freq = geo->a[i].freq; |
| 11514 | a_band->channels[i].hw_value = geo->a[i].channel; | 11514 | a_band->channels[i].hw_value = geo->a[i].channel; |
| 11515 | a_band->channels[i].max_power = geo->a[i].max_power; | 11515 | a_band->channels[i].max_power = geo->a[i].max_power; |
