TWxSoftware/twx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

b43: PHY: don't force default channel during init

Browse Source 
PHY may need to be re-initialized during runtime (e.g. on band switch).

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Rafał Miłecki
2014-05-31 20:49:36 +02:00
committed by John W. Linville
parent 8c79e5ee03
commit eb530b0fed
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/net/wireless/b43/phy_common.c
+3 -4
View File
@@ -94,7 +94,8 @@ int b43_phy_init(struct b43_wldev *dev)
const struct b43_phy_operations *ops = phy->ops; const struct b43_phy_operations *ops = phy->ops;
int err; int err;
phy->channel = ops->get_default_chan(dev); if (!phy->channel)
phy->channel = ops->get_default_chan(dev);
phy->ops->switch_analog(dev, true); phy->ops->switch_analog(dev, true);
b43_software_rfkill(dev, false); b43_software_rfkill(dev, false);
@@ -106,9 +107,7 @@ int b43_phy_init(struct b43_wldev *dev)
} }
phy->do_full_init = false; phy->do_full_init = false;
/* Make sure to switch hardware and firmware (SHM) to err = b43_switch_channel(dev, phy->channel);
* the default channel. */
err = b43_switch_channel(dev, ops->get_default_chan(dev));
if (err) { if (err) {
b43err(dev->wl, "PHY init: Channel switch to default failed\n"); b43err(dev->wl, "PHY init: Channel switch to default failed\n");
goto err_phy_exit; goto err_phy_exit;