Skip to content

Commit

Permalink
b43: N-PHY: optimize radio switching on/off
Browse files Browse the repository at this point in the history
Broadcom's wl 6.30.223.141 has some optimizations for radios 0x205[67].

Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
  • Loading branch information
Rafał Miłecki authored and John W. Linville committed May 29, 2014
1 parent 90e569d commit 6fe5514
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
4 changes: 3 additions & 1 deletion drivers/net/wireless/b43/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -3742,7 +3742,9 @@ static int b43_switch_band(struct b43_wldev *dev,
b43dbg(dev->wl, "Switching to %s GHz band\n",
band_to_string(chan->band));

b43_software_rfkill(dev, true);
/* Some new devices don't need disabling radio for band switching */
if (!(phy->type == B43_PHYTYPE_N && phy->rev >= 3))
b43_software_rfkill(dev, true);

phy->gmode = gmode;
b43_phy_put_into_reset(dev);
Expand Down
6 changes: 4 additions & 2 deletions drivers/net/wireless/b43/phy_n.c
Original file line number Diff line number Diff line change
Expand Up @@ -5707,10 +5707,12 @@ static void b43_nphy_op_software_rfkill(struct b43_wldev *dev,
}
} else {
if (dev->phy.rev >= 7) {
b43_radio_2057_init(dev);
if (!dev->phy.radio_on)
b43_radio_2057_init(dev);
b43_switch_channel(dev, dev->phy.channel);
} else if (dev->phy.rev >= 3) {
b43_radio_init2056(dev);
if (!dev->phy.radio_on)
b43_radio_init2056(dev);
b43_switch_channel(dev, dev->phy.channel);
} else {
b43_radio_init2055(dev);
Expand Down

0 comments on commit 6fe5514

Please sign in to comment.