lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b43/b43legacy: fix radio LED initialization

Browse Source 
Fix condition in which radio LED did not initialize correctly, and remove
4 compilation warnings.

After the recent changes in rfkill, the radio LED used by b43/b43legacy
did not always initialize correctly.

Both b43 and b43legacy used the deprecated variable radio_enabled in
struct ieee80211_conf.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Larry Finger
2009-06-20 12:58:11 -05:00
committed by John W. Linville
parent 1f5fc70a25
commit fd4973c56f
4 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/net/wireless/b43/b43.h
View File

@@ -648,6 +648,7 @@ struct b43_wl {
u8 nr_devs; u8 nr_devs;
bool radiotap_enabled; bool radiotap_enabled;
bool radio_enabled;
/* The beacon we are currently using (AP or IBSS mode). /* The beacon we are currently using (AP or IBSS mode).
* This beacon stuff is protected by the irq_lock. */ * This beacon stuff is protected by the irq_lock. */

7
drivers/net/wireless/b43/main.c
View File

@@ -3497,8 +3497,8 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed)
if (phy->ops->set_rx_antenna) if (phy->ops->set_rx_antenna)
phy->ops->set_rx_antenna(dev, antenna); phy->ops->set_rx_antenna(dev, antenna);
if (!!conf->radio_enabled != phy->radio_on) { if (wl->radio_enabled != phy->radio_on) {
if (conf->radio_enabled) { if (wl->radio_enabled) {
b43_software_rfkill(dev, false); b43_software_rfkill(dev, false);
b43info(dev->wl, "Radio turned on by software\n"); b43info(dev->wl, "Radio turned on by software\n");
if (!dev->radio_hw_enable) { if (!dev->radio_hw_enable) {
@@ -4339,6 +4339,7 @@ static int b43_op_start(struct ieee80211_hw *hw)
wl->beacon0_uploaded = 0; wl->beacon0_uploaded = 0;
wl->beacon1_uploaded = 0; wl->beacon1_uploaded = 0;
wl->beacon_templates_virgin = 1; wl->beacon_templates_virgin = 1;
wl->radio_enabled = 1;
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
@@ -4378,6 +4379,7 @@ static void b43_op_stop(struct ieee80211_hw *hw)
if (b43_status(dev) >= B43_STAT_STARTED) if (b43_status(dev) >= B43_STAT_STARTED)
b43_wireless_core_stop(dev); b43_wireless_core_stop(dev);
b43_wireless_core_exit(dev); b43_wireless_core_exit(dev);
wl->radio_enabled = 0;
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
cancel_work_sync(&(wl->txpower_adjust_work)); cancel_work_sync(&(wl->txpower_adjust_work));
@@ -4560,6 +4562,7 @@ static int b43_wireless_core_attach(struct b43_wldev *dev)
B43_WARN_ON(1); B43_WARN_ON(1);
dev->phy.gmode = have_2ghz_phy; dev->phy.gmode = have_2ghz_phy;
dev->phy.radio_on = 1;
tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0; tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;
b43_wireless_core_reset(dev, tmp); b43_wireless_core_reset(dev, tmp);

1
drivers/net/wireless/b43legacy/b43legacy.h
View File

@@ -607,6 +607,7 @@ struct b43legacy_wl {
u8 nr_devs; u8 nr_devs;
bool radiotap_enabled; bool radiotap_enabled;
bool radio_enabled;
/* The beacon we are currently using (AP or IBSS mode). /* The beacon we are currently using (AP or IBSS mode).
* This beacon stuff is protected by the irq_lock. */ * This beacon stuff is protected by the irq_lock. */

7
drivers/net/wireless/b43legacy/main.c
View File

@@ -2689,8 +2689,8 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw,
/* Antennas for RX and management frame TX. */ /* Antennas for RX and management frame TX. */
b43legacy_mgmtframe_txantenna(dev, antenna_tx); b43legacy_mgmtframe_txantenna(dev, antenna_tx);
if (!!conf->radio_enabled != phy->radio_on) { if (wl->radio_enabled != phy->radio_on) {
if (conf->radio_enabled) { if (wl->radio_enabled) {
b43legacy_radio_turn_on(dev); b43legacy_radio_turn_on(dev);
b43legacyinfo(dev->wl, "Radio turned on by software\n"); b43legacyinfo(dev->wl, "Radio turned on by software\n");
if (!dev->radio_hw_enable) if (!dev->radio_hw_enable)
@@ -3441,6 +3441,7 @@ static int b43legacy_op_start(struct ieee80211_hw *hw)
wl->beacon0_uploaded = 0; wl->beacon0_uploaded = 0;
wl->beacon1_uploaded = 0; wl->beacon1_uploaded = 0;
wl->beacon_templates_virgin = 1; wl->beacon_templates_virgin = 1;
wl->radio_enabled = 1;
mutex_lock(&wl->mutex); mutex_lock(&wl->mutex);
@@ -3479,6 +3480,7 @@ static void b43legacy_op_stop(struct ieee80211_hw *hw)
if (b43legacy_status(dev) >= B43legacy_STAT_STARTED) if (b43legacy_status(dev) >= B43legacy_STAT_STARTED)
b43legacy_wireless_core_stop(dev); b43legacy_wireless_core_stop(dev);
b43legacy_wireless_core_exit(dev); b43legacy_wireless_core_exit(dev);
wl->radio_enabled = 0;
mutex_unlock(&wl->mutex); mutex_unlock(&wl->mutex);
} }
@@ -3620,6 +3622,7 @@ static int b43legacy_wireless_core_attach(struct b43legacy_wldev *dev)
have_bphy = 1; have_bphy = 1;
dev->phy.gmode = (have_gphy || have_bphy); dev->phy.gmode = (have_gphy || have_bphy);
dev->phy.radio_on = 1;
tmp = dev->phy.gmode ? B43legacy_TMSLOW_GMODE : 0; tmp = dev->phy.gmode ? B43legacy_TMSLOW_GMODE : 0;
b43legacy_wireless_core_reset(dev, tmp); b43legacy_wireless_core_reset(dev, tmp);