diff options
author | Rafał Miłecki <zajec5@gmail.com> | 2014-05-31 13:40:45 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-06-16 11:23:33 -0400 |
commit | f15ec3451daf137a63d9cdc65ac5f863ce91fce5 (patch) | |
tree | 00dd3092afdc07cb8f380d6bb8fcb24ca3d83871 /drivers/net/wireless/b43 | |
parent | 7171511eaec5bf23fb06078f59784a3a0626b38f (diff) |
b43: disable 5 GHz on G-PHY
This fixes regression introduced by adding some G-PHY devices to the
list of dual band devices. There is simply no support for 5 GHz on
G-PHY devices in b43. It results in:
WARNING: CPU: 0 PID: 79 at drivers/net/wireless/b43/phy_g.c:75 b43_gphy_channel_switch+0x125/0x130 [b43]()
b43-phy1 ERROR: PHY init: Channel switch to default failed
Regression was introduced by the following commit:
commit 773cfc508f4d64c14547ff8751b5cbd473124364
Author: Rafał Miłecki <zajec5@gmail.com>
Date: Mon May 19 23:18:55 2014 +0200
b43: add more devices to the bands database
Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/b43')
-rw-r--r-- | drivers/net/wireless/b43/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 32538ac5f7e4..0d6a0bb1f876 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -5221,6 +5221,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev) | |||
5221 | /* We don't support 5 GHz on some PHYs yet */ | 5221 | /* We don't support 5 GHz on some PHYs yet */ |
5222 | switch (dev->phy.type) { | 5222 | switch (dev->phy.type) { |
5223 | case B43_PHYTYPE_A: | 5223 | case B43_PHYTYPE_A: |
5224 | case B43_PHYTYPE_G: | ||
5224 | case B43_PHYTYPE_N: | 5225 | case B43_PHYTYPE_N: |
5225 | case B43_PHYTYPE_LP: | 5226 | case B43_PHYTYPE_LP: |
5226 | case B43_PHYTYPE_HT: | 5227 | case B43_PHYTYPE_HT: |