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

Commit f41f3f37 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

b43/legacy: port to cfg80211 rfkill 



This ports the b43/legacy rfkill code to the new API offered
by cfg80211 and thus removes a lot of useless stuff.

Signed-off-by: default avatarJohannes Berg <johannes@sipsolutions.net>
Signed-off-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Cc: Michael Buesch <mb@bu3sch.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e6a3b616

drivers/net/wireless/b43/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -98,13 +98,6 @@ config B43_LEDS 
	depends on B43 && MAC80211_LEDS && (LEDS_CLASS = y || LEDS_CLASS = B43)

	default y



# This config option automatically enables b43 RFKILL support,

# if it's possible.

config B43_RFKILL

	bool

	depends on B43 && (RFKILL = y || RFKILL = B43)

	default y



# This config option automatically enables b43 HW-RNG support,

# if the HW-RNG core is enabled.

config B43_HWRNG

drivers/net/wireless/b43/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ b43-y += lo.o 
b43-y				+= wa.o

b43-y				+= dma.o

b43-$(CONFIG_B43_PIO)		+= pio.o

b43-$(CONFIG_B43_RFKILL)	+= rfkill.o

b43-y				+= rfkill.o

b43-$(CONFIG_B43_LEDS)		+= leds.o

b43-$(CONFIG_B43_PCMCIA)	+= pcmcia.o

b43-$(CONFIG_B43_DEBUG)		+= debugfs.o

drivers/net/wireless/b43/b43.h

+0 −3
Original line number Diff line number Diff line
@@ -631,9 +631,6 @@ struct b43_wl { 
	char rng_name[30 + 1];

#endif /* CONFIG_B43_HWRNG */



	/* The RF-kill button */

	struct b43_rfkill rfkill;



	/* List of all wireless devices on this chip */

	struct list_head devlist;

	u8 nr_devs;

drivers/net/wireless/b43/leds.c

+4 −3
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 


#include "b43.h"

#include "leds.h"

#include "rfkill.h"





static void b43_led_turn_on(struct b43_wldev *dev, u8 led_index,
@@ -164,10 +165,10 @@ static void b43_map_led(struct b43_wldev *dev, 
		snprintf(name, sizeof(name),

			 "b43-%s::radio", wiphy_name(hw->wiphy));

		b43_register_led(dev, &dev->led_radio, name,

				 b43_rfkill_led_name(dev),

				 ieee80211_get_radio_led_name(hw),

				 led_index, activelow);

		/* Sync the RF-kill LED state with the switch state. */

		if (dev->radio_hw_enable)

		/* Sync the RF-kill LED state with radio and switch states. */

		if (dev->phy.radio_on && b43_is_hw_radio_enabled(dev))

			b43_led_turn_on(dev, led_index, activelow);

		break;

	case B43_LED_WEIRD:

drivers/net/wireless/b43/main.c

+8 −19
Original line number Diff line number Diff line
@@ -4298,7 +4298,6 @@ static int b43_op_start(struct ieee80211_hw *hw) 
	struct b43_wldev *dev = wl->current_dev;

	int did_init = 0;

	int err = 0;

	bool do_rfkill_exit = 0;



	/* Kill all old instance specific information to make sure

	 * the card won't use it in the short timeframe between start
@@ -4312,18 +4311,12 @@ static int b43_op_start(struct ieee80211_hw *hw) 
	wl->beacon1_uploaded = 0;

	wl->beacon_templates_virgin = 1;



	/* First register RFkill.

	 * LEDs that are registered later depend on it. */

	b43_rfkill_init(dev);



	mutex_lock(&wl->mutex);



	if (b43_status(dev) < B43_STAT_INITIALIZED) {

		err = b43_wireless_core_init(dev);

		if (err) {

			do_rfkill_exit = 1;

		if (err)

			goto out_mutex_unlock;

		}

		did_init = 1;

	}
@@ -4332,17 +4325,16 @@ static int b43_op_start(struct ieee80211_hw *hw) 
		if (err) {

			if (did_init)

				b43_wireless_core_exit(dev);

			do_rfkill_exit = 1;

			goto out_mutex_unlock;

		}

	}



	/* XXX: only do if device doesn't support rfkill irq */

	wiphy_rfkill_start_polling(hw->wiphy);



 out_mutex_unlock:

	mutex_unlock(&wl->mutex);



	if (do_rfkill_exit)

		b43_rfkill_exit(dev);



	return err;

}
@@ -4351,7 +4343,6 @@ static void b43_op_stop(struct ieee80211_hw *hw) 
	struct b43_wl *wl = hw_to_b43_wl(hw);

	struct b43_wldev *dev = wl->current_dev;



	b43_rfkill_exit(dev);

	cancel_work_sync(&(wl->beacon_update_trigger));



	mutex_lock(&wl->mutex);
@@ -4433,6 +4424,7 @@ static const struct ieee80211_ops b43_hw_ops = { 
	.sta_notify		= b43_op_sta_notify,

	.sw_scan_start		= b43_op_sw_scan_start_notifier,

	.sw_scan_complete	= b43_op_sw_scan_complete_notifier,

	.rfkill_poll		= b43_rfkill_poll,

};



/* Hard-reset the chip. Do not call this directly.
@@ -4920,7 +4912,7 @@ static struct ssb_driver b43_ssb_driver = { 
static void b43_print_driverinfo(void)

{

	const char *feat_pci = "", *feat_pcmcia = "", *feat_nphy = "",

		   *feat_leds = "", *feat_rfkill = "";

		   *feat_leds = "";



#ifdef CONFIG_B43_PCI_AUTOSELECT

	feat_pci = "P";
@@ -4933,15 +4925,12 @@ static void b43_print_driverinfo(void) 
#endif

#ifdef CONFIG_B43_LEDS

	feat_leds = "L";

#endif

#ifdef CONFIG_B43_RFKILL

	feat_rfkill = "R";

#endif

	printk(KERN_INFO "Broadcom 43xx driver loaded "

	       "[ Features: %s%s%s%s%s, Firmware-ID: "

	       "[ Features: %s%s%s%s, Firmware-ID: "

	       B43_SUPPORTED_FIRMWARE_ID " ]\n",

	       feat_pci, feat_pcmcia, feat_nphy,

	       feat_leds, feat_rfkill);

	       feat_leds);

}



static int __init b43_init(void)