Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd4973c5 authored by Larry Finger's avatar Larry Finger Committed by John W. Linville
Browse files

b43/b43legacy: fix radio LED initialization 



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: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 1f5fc70a

drivers/net/wireless/b43/b43.h

+1 −0
Original line number Diff line number Diff line
@@ -648,6 +648,7 @@ struct b43_wl { 
	u8 nr_devs;



	bool radiotap_enabled;

	bool radio_enabled;



	/* The beacon we are currently using (AP or IBSS mode).

	 * This beacon stuff is protected by the irq_lock. */

drivers/net/wireless/b43/main.c

+5 −2
Original line number Diff line number Diff line
@@ -3497,8 +3497,8 @@ static int b43_op_config(struct ieee80211_hw *hw, u32 changed) 
	if (phy->ops->set_rx_antenna)

		phy->ops->set_rx_antenna(dev, antenna);



	if (!!conf->radio_enabled != phy->radio_on) {

		if (conf->radio_enabled) {

	if (wl->radio_enabled != phy->radio_on) {

		if (wl->radio_enabled) {

			b43_software_rfkill(dev, false);

			b43info(dev->wl, "Radio turned on by software\n");

			if (!dev->radio_hw_enable) {
@@ -4339,6 +4339,7 @@ static int b43_op_start(struct ieee80211_hw *hw) 
	wl->beacon0_uploaded = 0;

	wl->beacon1_uploaded = 0;

	wl->beacon_templates_virgin = 1;

	wl->radio_enabled = 1;



	mutex_lock(&wl->mutex);
@@ -4378,6 +4379,7 @@ static void b43_op_stop(struct ieee80211_hw *hw) 
	if (b43_status(dev) >= B43_STAT_STARTED)

		b43_wireless_core_stop(dev);

	b43_wireless_core_exit(dev);

	wl->radio_enabled = 0;

	mutex_unlock(&wl->mutex);



	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);



	dev->phy.gmode = have_2ghz_phy;

	dev->phy.radio_on = 1;

	tmp = dev->phy.gmode ? B43_TMSLOW_GMODE : 0;

	b43_wireless_core_reset(dev, tmp);

drivers/net/wireless/b43legacy/b43legacy.h

+1 −0
Original line number Diff line number Diff line
@@ -607,6 +607,7 @@ struct b43legacy_wl { 
	u8 nr_devs;



	bool radiotap_enabled;

	bool radio_enabled;



	/* The beacon we are currently using (AP or IBSS mode).

	 * This beacon stuff is protected by the irq_lock. */

drivers/net/wireless/b43legacy/main.c

+5 −2
Original line number Diff line number Diff line
@@ -2689,8 +2689,8 @@ static int b43legacy_op_dev_config(struct ieee80211_hw *hw, 
	/* Antennas for RX and management frame TX. */

	b43legacy_mgmtframe_txantenna(dev, antenna_tx);



	if (!!conf->radio_enabled != phy->radio_on) {

		if (conf->radio_enabled) {

	if (wl->radio_enabled != phy->radio_on) {

		if (wl->radio_enabled) {

			b43legacy_radio_turn_on(dev);

			b43legacyinfo(dev->wl, "Radio turned on by software\n");

			if (!dev->radio_hw_enable)
@@ -3441,6 +3441,7 @@ static int b43legacy_op_start(struct ieee80211_hw *hw) 
	wl->beacon0_uploaded = 0;

	wl->beacon1_uploaded = 0;

	wl->beacon_templates_virgin = 1;

	wl->radio_enabled = 1;



	mutex_lock(&wl->mutex);
@@ -3479,6 +3480,7 @@ static void b43legacy_op_stop(struct ieee80211_hw *hw) 
	if (b43legacy_status(dev) >= B43legacy_STAT_STARTED)

		b43legacy_wireless_core_stop(dev);

	b43legacy_wireless_core_exit(dev);

	wl->radio_enabled = 0;

	mutex_unlock(&wl->mutex);

}
@@ -3620,6 +3622,7 @@ static int b43legacy_wireless_core_attach(struct b43legacy_wldev *dev) 
		have_bphy = 1;



	dev->phy.gmode = (have_gphy || have_bphy);

	dev->phy.radio_on = 1;

	tmp = dev->phy.gmode ? B43legacy_TMSLOW_GMODE : 0;

	b43legacy_wireless_core_reset(dev, tmp);