Skip to contentSkip to conversation

ath5k: added cfg80211 based rfkill support

PATCH In review Tobias Doerffel 4 participants 10 messages Jun 7, 2009 – Jun 10, 2009 Atheros ATH5K wireless driver

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ath5k: added cfg80211 based rfkill support

This patch introduces initial rfkill support for the ath5k driver based on rfkill support in the cfg80211 framework.
All rfkill related code is separated into newly created rfkill.c.

Changes to existing code are minimal:

* added a new data structure ath5k_rfkill to the ath5k_softc structure
* new function ath5k_eeprom_read_rfkill() for retrieving RFKILL related parameters from EEPROM
* inserted calls to HW rfkill init/deinit routines
* ath5k_intr() has been extended to handle AR5K_INT_GPIO interrupts

---
 drivers/net/wireless/ath/ath5k/Kconfig  |    9 +++
 drivers/net/wireless/ath/ath5k/Makefile |    1 +
 drivers/net/wireless/ath/ath5k/ath5k.h  |   10 +++
 drivers/net/wireless/ath/ath5k/base.c   |   10 +++
 drivers/net/wireless/ath/ath5k/base.h   |   14 ++++
 drivers/net/wireless/ath/ath5k/eeprom.c |   16 ++++
 drivers/net/wireless/ath/ath5k/reset.c  |   17 -----
 drivers/net/wireless/ath/ath5k/rfkill.c |  120 +++++++++++++++++++++++++++++++
 8 files changed, 180 insertions(+), 17 deletions(-)
 create mode 100644 drivers/net/wireless/ath/ath5k/rfkill.c
drivers/net/wireless/ath/ath5k/Kconfig +9 -0
index 509b6f9..5f18954 100644
@@ -39,3 +39,12 @@ config ATH5K_DEBUG
 
 	  modprobe ath5k debug=0x00000400
 
+config ATH5K_RFKILL
+	bool "Atheros 5xxx rfkill support"
+	depends on RFKILL
+	depends on ATH5K
+	default y
+	---help---
+	  Include support for enabling/disabling WiFi via rfkill switch
+	  with Atheros 5xxx cards
+
drivers/net/wireless/ath/ath5k/Makefile +1 -0
index 84a74c5..f1e281c 100644
@@ -12,4 +12,5 @@ ath5k-y				+= attach.o
 ath5k-y				+= base.o
 ath5k-y				+= led.o
 ath5k-$(CONFIG_ATH5K_DEBUG)	+= debug.o
+ath5k-$(CONFIG_ATH5K_RFKILL)	+= rfkill.o
 obj-$(CONFIG_ATH5K)		+= ath5k.o
drivers/net/wireless/ath/ath5k/ath5k.h +10 -0
index 8137182..125e896 100644
@@ -1190,6 +1190,7 @@ extern void ath5k_hw_update_mib_counters(struct ath5k_hw *ah, struct ieee80211_l
 extern int ath5k_eeprom_init(struct ath5k_hw *ah);
 extern void ath5k_eeprom_detach(struct ath5k_hw *ah);
 extern int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac);
+extern void ath5k_eeprom_read_rfkill(struct ath5k_hw *ah, u16 *gpio, u8 *polarity);
 extern bool ath5k_eeprom_is_hb63(struct ath5k_hw *ah);
 
 /* Protocol Control Unit Functions */
@@ -1256,6 +1257,15 @@ extern u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio);
 extern int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val);
 extern void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio, u32 interrupt_level);
 
+/* rfkill Functions */
+#ifdef CONFIG_ATH5K_RFKILL
+extern void ath5k_rfkill_hw_start(struct ath5k_hw *ah);
+extern void ath5k_rfkill_hw_stop(struct ath5k_hw *ah);
+#else
+static inline void ath5k_rfkill_hw_start(struct ath5k_hw *ah) {}
+static inline void ath5k_rfkill_hw_stop(struct ath5k_hw *ah) {}
+#endif
+
 /* Misc functions */
 int ath5k_hw_set_capabilities(struct ath5k_hw *ah);
 extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);
drivers/net/wireless/ath/ath5k/base.c +10 -0
index 85a00db..f55675c 100644
@@ -2360,6 +2360,8 @@ ath5k_init(struct ath5k_softc *sc)
 	if (ret)
 		goto done;
 
+	ath5k_rfkill_hw_start(ah);
+
 	/*
 	 * Reset the key cache since some parts do not reset the
 	 * contents on initial power up or resume from suspend.
@@ -2468,6 +2470,8 @@ ath5k_stop_hw(struct ath5k_softc *sc)
 	tasklet_kill(&sc->restq);
 	tasklet_kill(&sc->beacontq);
 
+	ath5k_rfkill_hw_stop(sc->ah);
+
 	return ret;
 }
 
@@ -2526,6 +2530,12 @@ ath5k_intr(int irq, void *dev_id)
 				 */
 				ath5k_hw_update_mib_counters(ah, &sc->ll_stats);
 			}
+#ifdef CONFIG_ATH5K_RFKILL
+			if (status & AR5K_INT_GPIO)
+			{
+				tasklet_schedule(&sc->rf_kill.toggleq);
+			}
+#endif
 		}
 	} while (ath5k_hw_is_intr_pending(ah) && --counter > 0);
 
drivers/net/wireless/ath/ath5k/base.h +14 -0
index 852b2c1..5e1f904 100644
@@ -46,6 +46,7 @@
 #include <linux/wireless.h>
 #include <linux/if_ether.h>
 #include <linux/leds.h>
+#include <linux/rfkill.h>
 
 #include "ath5k.h"
 #include "debug.h"
@@ -91,6 +92,15 @@ struct ath5k_led
 	struct led_classdev led_dev;		/* led classdev */
 };
 
+/* Rfkill */
+struct ath5k_rfkill {
+	/* GPIO PIN for rfkill */
+	u16 gpio;
+	/* polarity of rfkill GPIO PIN */
+	u8 polarity;
+	/* RFKILL toggle tasklet */
+	struct tasklet_struct toggleq;
+};
 
 #if CHAN_DEBUG
 #define ATH_CHAN_MAX	(26+26+26+200+200)
@@ -167,6 +177,10 @@ struct ath5k_softc {
 	struct tasklet_struct	txtq;		/* tx intr tasklet */
 	struct ath5k_led	tx_led;		/* tx led */
 
+#ifdef CONFIG_ATH5K_RFKILL
+	struct ath5k_rfkill	rf_kill;
+#endif
+
 	spinlock_t		block;		/* protects beacon */
 	struct tasklet_struct	beacontq;	/* beacon intr tasklet */
 	struct ath5k_buf	*bbuf;		/* beacon buffer */
drivers/net/wireless/ath/ath5k/eeprom.c +16 -0
index c56b494..ff00502 100644
@@ -1800,3 +1800,19 @@ int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac)
 
 	return 0;
 }
+
+
+/*
+ * Read RFKILL GPIO configuration from eeprom
+ */
+void ath5k_eeprom_read_rfkill(struct ath5k_hw *ah, u16 *gpio, u8 *polarity)
+{
+	u16 data;
+
+	ath5k_hw_eeprom_read(ah, AR5K_EEPROM_RFKILL_GPIO_SEL, &data);
+	*gpio = AR5K_REG_MS(data, AR5K_EEPROM_RFKILL_GPIO_SEL);
+
+	ath5k_hw_eeprom_read(ah, AR5K_EEPROM_RFKILL_POLARITY, &data);
+	*polarity = AR5K_REG_MS(data, AR5K_EEPROM_RFKILL_POLARITY);
+}
+
drivers/net/wireless/ath/ath5k/reset.c +0 -17
index bd1940e..8077f0a 100644
@@ -1305,23 +1305,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
 	if (ah->ah_version != AR5K_AR5210)
 		ath5k_hw_set_imr(ah, ah->ah_imr);
 
-	/*
-	 * Setup RFKill interrupt if rfkill flag is set on eeprom.
-	 * TODO: Use gpio pin and polarity infos from eeprom
-	 * TODO: Handle this in ath5k_intr because it'll result
-	 * 	 a nasty interrupt storm.
-	 */
-#if 0
-	if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
-		ath5k_hw_set_gpio_input(ah, 0);
-		ah->ah_gpio[0] = ath5k_hw_get_gpio(ah, 0);
-		if (ah->ah_gpio[0] == 0)
-			ath5k_hw_set_gpio_intr(ah, 0, 1);
-		else
-			ath5k_hw_set_gpio_intr(ah, 0, 0);
-	}
-#endif
-
 	/* Enable 32KHz clock function for AR5212+ chips
 	 * Set clocks to 32KHz operation and use an
 	 * external 32KHz crystal when sleeping if one
drivers/net/wireless/ath/ath5k/rfkill.c new file +120 -0

120 lines not on this page · raw message

Signature · 1 line
1.6.3.1
#1 lore raw

drivers/net/wireless/ath/ath5k/Kconfig config ATH5K_DEBUG · line 49

Quoted 8 lines · Tobias Doerffel
drivers/net/wireless/ath/ath5k/Kconfig +8 -0
+config ATH5K_RFKILL
+	bool "Atheros 5xxx rfkill support"
+	depends on RFKILL
+	depends on ATH5K
+	default y
+	---help---
+	  Include support for enabling/disabling WiFi via rfkill switch
+	  with Atheros 5xxx cards

This shouldn't be necessary. All APIs are always present.

johannes

#2 lore raw
In reply to Tobias Doerffel

drivers/net/wireless/ath/ath5k/eeprom.c int ath5k_eeprom_read_mac(struct ath5k_hw *ah, u8 *mac) · line 1817

Quoted 13 lines · Tobias Doerffel
drivers/net/wireless/ath/ath5k/eeprom.c +13 -0
+/*
+ * Read RFKILL GPIO configuration from eeprom
+ */
+void ath5k_eeprom_read_rfkill(struct ath5k_hw *ah, u16 *gpio, u8 *polarity)
+{
+	u16 data;
+
+	ath5k_hw_eeprom_read(ah, AR5K_EEPROM_RFKILL_GPIO_SEL, &data);
+	*gpio = AR5K_REG_MS(data, AR5K_EEPROM_RFKILL_GPIO_SEL);
+
+	ath5k_hw_eeprom_read(ah, AR5K_EEPROM_RFKILL_POLARITY, &data);
+	*polarity = AR5K_REG_MS(data, AR5K_EEPROM_RFKILL_POLARITY);
+}

ath5k_eeprom_init_header already reads these values and stuffs them in the ath5k_eeprom_info struct - you can just use them from there. Otherwise, mod Johanne's comment, looks great! Thanks for handling this.

Signature · 1 line
Bob Copeland %% www.bobcopeland.com
#3 lore raw

PATCH 1/1 ath5k: added cfg80211 based rfkill support

This patch introduces initial rfkill support for the ath5k driver based on rfkill support in the cfg80211 framework.
All rfkill related code is separated into newly created rfkill.c.

Changes to existing code are minimal:

* added a new data structure ath5k_rfkill to the ath5k_softc structure
* inserted calls to HW rfkill init/deinit routines
* ath5k_intr() has been extended to handle AR5K_INT_GPIO interrupts

---
 drivers/net/wireless/ath/ath5k/Kconfig  |    8 ++
 drivers/net/wireless/ath/ath5k/Makefile |    1 +
 drivers/net/wireless/ath/ath5k/ath5k.h  |    9 +++
 drivers/net/wireless/ath/ath5k/base.c   |   10 +++
 drivers/net/wireless/ath/ath5k/base.h   |   14 ++++
 drivers/net/wireless/ath/ath5k/reset.c  |   17 -----
 drivers/net/wireless/ath/ath5k/rfkill.c |  121 +++++++++++++++++++++++++++++++
 7 files changed, 163 insertions(+), 17 deletions(-)
 create mode 100644 drivers/net/wireless/ath/ath5k/rfkill.c
drivers/net/wireless/ath/ath5k/Kconfig +8 -0
index 509b6f9..4863f4b 100644
@@ -39,3 +39,11 @@ config ATH5K_DEBUG
 
 	  modprobe ath5k debug=0x00000400
 
+config ATH5K_RFKILL
+	bool "Atheros 5xxx rfkill support"
+	depends on ATH5K
+	default y
+	---help---
+	  Include support for enabling/disabling WiFi via rfkill switch
+	  with Atheros 5xxx cards
+
drivers/net/wireless/ath/ath5k/Makefile +1 -0
index 84a74c5..f1e281c 100644
@@ -12,4 +12,5 @@ ath5k-y				+= attach.o
 ath5k-y				+= base.o
 ath5k-y				+= led.o
 ath5k-$(CONFIG_ATH5K_DEBUG)	+= debug.o
+ath5k-$(CONFIG_ATH5K_RFKILL)	+= rfkill.o
 obj-$(CONFIG_ATH5K)		+= ath5k.o
drivers/net/wireless/ath/ath5k/ath5k.h +9 -0
index 8137182..4c84e30 100644
@@ -1256,6 +1256,15 @@ extern u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio);
 extern int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val);
 extern void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio, u32 interrupt_level);
 
+/* rfkill Functions */
+#ifdef CONFIG_ATH5K_RFKILL
+extern void ath5k_rfkill_hw_start(struct ath5k_hw *ah);
+extern void ath5k_rfkill_hw_stop(struct ath5k_hw *ah);
+#else
+static inline void ath5k_rfkill_hw_start(struct ath5k_hw *ah) {}
+static inline void ath5k_rfkill_hw_stop(struct ath5k_hw *ah) {}
+#endif
+
 /* Misc functions */
 int ath5k_hw_set_capabilities(struct ath5k_hw *ah);
 extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);
drivers/net/wireless/ath/ath5k/base.c +10 -0
index 85a00db..f55675c 100644
@@ -2360,6 +2360,8 @@ ath5k_init(struct ath5k_softc *sc)
 	if (ret)
 		goto done;
 
+	ath5k_rfkill_hw_start(ah);
+
 	/*
 	 * Reset the key cache since some parts do not reset the
 	 * contents on initial power up or resume from suspend.
@@ -2468,6 +2470,8 @@ ath5k_stop_hw(struct ath5k_softc *sc)
 	tasklet_kill(&sc->restq);
 	tasklet_kill(&sc->beacontq);
 
+	ath5k_rfkill_hw_stop(sc->ah);
+
 	return ret;
 }
 
@@ -2526,6 +2530,12 @@ ath5k_intr(int irq, void *dev_id)
 				 */
 				ath5k_hw_update_mib_counters(ah, &sc->ll_stats);
 			}
+#ifdef CONFIG_ATH5K_RFKILL
+			if (status & AR5K_INT_GPIO)
+			{
+				tasklet_schedule(&sc->rf_kill.toggleq);
+			}
+#endif
 		}
 	} while (ath5k_hw_is_intr_pending(ah) && --counter > 0);
 
drivers/net/wireless/ath/ath5k/base.h +14 -0
index 852b2c1..7a0ecdd 100644
@@ -46,6 +46,7 @@
 #include <linux/wireless.h>
 #include <linux/if_ether.h>
 #include <linux/leds.h>
+#include <linux/rfkill.h>
 
 #include "ath5k.h"
 #include "debug.h"
@@ -91,6 +92,15 @@ struct ath5k_led
 	struct led_classdev led_dev;		/* led classdev */
 };
 
+/* Rfkill */
+struct ath5k_rfkill {
+	/* GPIO PIN for rfkill */
+	u16 gpio;
+	/* polarity of rfkill GPIO PIN */
+	bool polarity;
+	/* RFKILL toggle tasklet */
+	struct tasklet_struct toggleq;
+};
 
 #if CHAN_DEBUG
 #define ATH_CHAN_MAX	(26+26+26+200+200)
@@ -167,6 +177,10 @@ struct ath5k_softc {
 	struct tasklet_struct	txtq;		/* tx intr tasklet */
 	struct ath5k_led	tx_led;		/* tx led */
 
+#ifdef CONFIG_ATH5K_RFKILL
+	struct ath5k_rfkill	rf_kill;
+#endif
+
 	spinlock_t		block;		/* protects beacon */
 	struct tasklet_struct	beacontq;	/* beacon intr tasklet */
 	struct ath5k_buf	*bbuf;		/* beacon buffer */
drivers/net/wireless/ath/ath5k/reset.c +0 -17
index bd1940e..8077f0a 100644
@@ -1305,23 +1305,6 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum nl80211_iftype op_mode,
 	if (ah->ah_version != AR5K_AR5210)
 		ath5k_hw_set_imr(ah, ah->ah_imr);
 
-	/*
-	 * Setup RFKill interrupt if rfkill flag is set on eeprom.
-	 * TODO: Use gpio pin and polarity infos from eeprom
-	 * TODO: Handle this in ath5k_intr because it'll result
-	 * 	 a nasty interrupt storm.
-	 */
-#if 0
-	if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
-		ath5k_hw_set_gpio_input(ah, 0);
-		ah->ah_gpio[0] = ath5k_hw_get_gpio(ah, 0);
-		if (ah->ah_gpio[0] == 0)
-			ath5k_hw_set_gpio_intr(ah, 0, 1);
-		else
-			ath5k_hw_set_gpio_intr(ah, 0, 0);
-	}
-#endif
-
 	/* Enable 32KHz clock function for AR5212+ chips
 	 * Set clocks to 32KHz operation and use an
 	 * external 32KHz crystal when sleeping if one
drivers/net/wireless/ath/ath5k/rfkill.c new file +121 -0

121 lines not on this page · raw message

Signature · 1 line
1.6.3.1
#4 lore raw

drivers/net/wireless/ath/ath5k/Kconfig config ATH5K_DEBUG · line 49

Quoted 8 lines · Tobias Doerffel
drivers/net/wireless/ath/ath5k/Kconfig +8 -0
+config ATH5K_RFKILL
+       bool "Atheros 5xxx rfkill support"
+       depends on ATH5K
+       default y
+       ---help---
+         Include support for enabling/disabling WiFi via rfkill switch
+         with Atheros 5xxx cards
+

We can still drop this.

Quoted 4 lines

+       /* enable interrupt for rfkill switch */
+       if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
+               ath5k_rfkill_set_intr(sc, true);
+       }

Coding style...

Quoted 3 lines

+       if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
+               ath5k_rfkill_set_intr(sc, false);
+       }

Ditto..

Quoted 2 lines

+       /* enable RFKILL when stopping HW so Wifi LED is turned off */
+       ath5k_rfkill_enable(sc);

Odd, but ok :)

This looks really close and the remaining changes are pretty small. If you want, I can take care of the above and resubmit it with your s-o-b so you don't have to go through another respin.

Signature · 1 line
Bob Copeland %% www.bobcopeland.com
#5 lore raw
Quoted 27 lines · Bob Copeland

drivers/net/wireless/ath/ath5k/Kconfig config ATH5K_DEBUG · line 49

Quoted 8 lines · Tobias Doerffel
drivers/net/wireless/ath/ath5k/Kconfig +8 -0
+config ATH5K_RFKILL
+       bool "Atheros 5xxx rfkill support"
+       depends on ATH5K
+       default y
+       ---help---
+         Include support for enabling/disabling WiFi via rfkill switch
+         with Atheros 5xxx cards
+

We can still drop this.

Quoted 4 lines

+       /* enable interrupt for rfkill switch */
+       if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
+               ath5k_rfkill_set_intr(sc, true);
+       }

Coding style...

Quoted 3 lines

+       if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
+               ath5k_rfkill_set_intr(sc, false);
+       }

Ditto..

Quoted 8 lines
Quoted 2 lines

+       /* enable RFKILL when stopping HW so Wifi LED is turned off */
+       ath5k_rfkill_enable(sc);

Odd, but ok :)

This looks really close and the remaining changes are pretty small. If you want, I can take care of the above and resubmit it with your s-o-b so you don't have to go through another respin.

If that is your offer, maybe you could just do your own patch on top?

John

Signature · 2 lines
John W. Linville		Someday the world will need a hero, and you
[email protected]			might be all we have.  Be ready.
#6 lore raw
Quoted 6 lines · John W. Linville
Quoted 4 lines

This looks really close and the remaining changes are pretty small.  If you want, I can take care of the above and resubmit it with your s-o-b so you don't have to go through another respin.

If that is your offer, maybe you could just do your own patch on top?

Sure, works for me.

Signature · 1 line
Bob Copeland %% www.bobcopeland.com
#7 lore raw

PATCH 1/1 ath5k: minor rfkill cleanup

In reply to John W. Linville

Always enable rfkill since the ifdefs in the code is not really worth the Kconfig option. Also fix a few code style things, and remove the usage of the ah_gpio[] array so we can remove it later.

---
 drivers/net/wireless/ath/ath5k/Kconfig  |    8 --------
 drivers/net/wireless/ath/ath5k/Makefile |    2 +-
 drivers/net/wireless/ath/ath5k/ath5k.h  |    5 -----
 drivers/net/wireless/ath/ath5k/base.c   |    5 +----
 drivers/net/wireless/ath/ath5k/base.h   |    2 --
 drivers/net/wireless/ath/ath5k/rfkill.c |   12 ++++++------
 6 files changed, 8 insertions(+), 26 deletions(-)
drivers/net/wireless/ath/ath5k/Kconfig +0 -8
index 4863f4b..509b6f9 100644
@@ -39,11 +39,3 @@ config ATH5K_DEBUG
 
 	  modprobe ath5k debug=0x00000400
 
-config ATH5K_RFKILL
-	bool "Atheros 5xxx rfkill support"
-	depends on ATH5K
-	default y
-	---help---
-	  Include support for enabling/disabling WiFi via rfkill switch
-	  with Atheros 5xxx cards
-
drivers/net/wireless/ath/ath5k/Makefile +1 -1
index f1e281c..090dc6d 100644
@@ -11,6 +11,6 @@ ath5k-y				+= reset.o
 ath5k-y				+= attach.o
 ath5k-y				+= base.o
 ath5k-y				+= led.o
+ath5k-y				+= rfkill.o
 ath5k-$(CONFIG_ATH5K_DEBUG)	+= debug.o
-ath5k-$(CONFIG_ATH5K_RFKILL)	+= rfkill.o
 obj-$(CONFIG_ATH5K)		+= ath5k.o
drivers/net/wireless/ath/ath5k/ath5k.h +0 -5
index 4c84e30..6358233 100644
@@ -1257,13 +1257,8 @@ extern int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val);
 extern void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio, u32 interrupt_level);
 
 /* rfkill Functions */
-#ifdef CONFIG_ATH5K_RFKILL
 extern void ath5k_rfkill_hw_start(struct ath5k_hw *ah);
 extern void ath5k_rfkill_hw_stop(struct ath5k_hw *ah);
-#else
-static inline void ath5k_rfkill_hw_start(struct ath5k_hw *ah) {}
-static inline void ath5k_rfkill_hw_stop(struct ath5k_hw *ah) {}
-#endif
 
 /* Misc functions */
 int ath5k_hw_set_capabilities(struct ath5k_hw *ah);
drivers/net/wireless/ath/ath5k/base.c +1 -4
index f55675c..55f7de0 100644
@@ -2530,12 +2530,9 @@ ath5k_intr(int irq, void *dev_id)
 				 */
 				ath5k_hw_update_mib_counters(ah, &sc->ll_stats);
 			}
-#ifdef CONFIG_ATH5K_RFKILL
 			if (status & AR5K_INT_GPIO)
-			{
 				tasklet_schedule(&sc->rf_kill.toggleq);
-			}
-#endif
+
 		}
 	} while (ath5k_hw_is_intr_pending(ah) && --counter > 0);
 
drivers/net/wireless/ath/ath5k/base.h +0 -2
index 7a0ecdd..f9b7f2f 100644
@@ -177,9 +177,7 @@ struct ath5k_softc {
 	struct tasklet_struct	txtq;		/* tx intr tasklet */
 	struct ath5k_led	tx_led;		/* tx led */
 
-#ifdef CONFIG_ATH5K_RFKILL
 	struct ath5k_rfkill	rf_kill;
-#endif
 
 	spinlock_t		block;		/* protects beacon */
 	struct tasklet_struct	beacontq;	/* beacon intr tasklet */
drivers/net/wireless/ath/ath5k/rfkill.c +6 -6
index 492ada9..41a877b 100644
@@ -56,10 +56,12 @@ static inline void ath5k_rfkill_enable(struct ath5k_softc *sc)
 static inline void ath5k_rfkill_set_intr(struct ath5k_softc *sc, bool enable)
 {
 	struct ath5k_hw *ah = sc->ah;
+	u32 curval;
+
 	ath5k_hw_set_gpio_input(ah, sc->rf_kill.gpio);
-	ah->ah_gpio[0] = ath5k_hw_get_gpio(ah, sc->rf_kill.gpio);
+	curval = ath5k_hw_get_gpio(ah, sc->rf_kill.gpio);
 	ath5k_hw_set_gpio_intr(ah, sc->rf_kill.gpio, enable ?
-					!!ah->ah_gpio[0] : !ah->ah_gpio[0]);
+					!!curval : !curval);
 }
 
 static bool
@@ -97,9 +99,8 @@ ath5k_rfkill_hw_start(struct ath5k_hw *ah)
 	ath5k_rfkill_disable(sc);
 
 	/* enable interrupt for rfkill switch */
-	if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
+	if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header))
 		ath5k_rfkill_set_intr(sc, true);
-	}
 }
 
 
@@ -109,9 +110,8 @@ ath5k_rfkill_hw_stop(struct ath5k_hw *ah)
 	struct ath5k_softc *sc = ah->ah_sc;
 
 	/* disable interrupt for rfkill switch */
-	if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header)) {
+	if (AR5K_EEPROM_HDR_RFKILL(ah->ah_capabilities.cap_eeprom.ee_header))
 		ath5k_rfkill_set_intr(sc, false);
-	}
 
 	tasklet_kill(&sc->rf_kill.toggleq);
 
Signature · 1 line
1.6.0.6
#8 lore raw
In reply to Bob Copeland

Hi,

Am Dienstag, 9. Juni 2009 20:26:12 schrieb Bob Copeland:

Quoted 4 lines

drivers/net/wireless/ath/ath5k/rfkill.c line 119

Quoted 2 lines
drivers/net/wireless/ath/ath5k/rfkill.c new file +2 -0
+       /* enable RFKILL when stopping HW so Wifi LED is turned off */
+       ath5k_rfkill_enable(sc);

Odd, but ok :)

Why odd? As a user if I disable Wifi (i.e. enable rfkill, be it via software or rfkill switch), I do not want the LED to be active anymore. It also might have minimal influence on power consumption ;-)

Regarding the other changes I'd agree on an additional patch made up by you.

Toby

#9 lore raw
Quoted 10 lines · Tobias Doerffel

Hi,

Am Dienstag, 9. Juni 2009 20:26:12 schrieb Bob Copeland:

Quoted 4 lines
Quoted 2 lines

+       /* enable RFKILL when stopping HW so Wifi LED is turned off */
+       ath5k_rfkill_enable(sc);

Odd, but ok :)

Why odd? As a user if I disable Wifi (i.e. enable rfkill, be it via software or rfkill switch), I do not want the LED to be active anymore. It also might have minimal influence on power consumption ;-)

No, I agree it is fine as-is, the oddness is just naming confusion (stop calls rfkill_enable, sort of a double negative). But I don't have anything better.

Signature · 1 line
Bob Copeland %% www.bobcopeland.com