All of lore.kernel.org
 help / color / mirror / Atom feed
* [RFC PATCH] rtl8187: Fix led support for rfkill
@ 2011-03-26 21:19 ` Wu Zhangjin
  0 siblings, 0 replies; 18+ messages in thread
From: Wu Zhangjin @ 2011-03-26 21:19 UTC (permalink / raw)
  To: Herton Ronaldo Krzesinski, Hin-Tak Leung, Larry Finger
  Cc: linux-wireless, netdev, Wu Zhangjin

led can not be turned off normally when rfkill is blocked, the cause is
the led_turn_off() function exit as not expected:

drivers/net/wireless/rtl818x/rtl8187/leds.c:

static void led_turn_off(struct work_struct *work)
{
	[...]
	/* Don't change the LED, when the device is down. */
	if (!priv->vif || priv->vif->type == NL80211_IFTYPE_UNSPECIFIED)
		return ;
	[...]

When rfkill is blocked, the function calling order looks like this:

net/mac80211/iface.c:

ieee80211_do_stop
	-> drv_remove_interface = rtl8187_remove_interface
	-> ieee80211_stop_device
		-> led_set_brightness
			-> led_turn_off
	-> drv_stop = rtl8187_stop

rtl8187_remove_interface() set priv->vif to NULL, so, led_turn_off()
will return and will not be able to turn off the led. delay the setting
of priv->vif to rtl8187_stop() can solve it.

Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
---
 drivers/net/wireless/rtl818x/rtl8187/dev.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/wireless/rtl818x/rtl8187/dev.c b/drivers/net/wireless/rtl818x/rtl8187/dev.c
index 2bb5297..1fea0cd 100644
--- a/drivers/net/wireless/rtl818x/rtl8187/dev.c
+++ b/drivers/net/wireless/rtl818x/rtl8187/dev.c
@@ -1007,6 +1007,9 @@ static void rtl8187_stop(struct ieee80211_hw *dev)
 	u32 reg;
 
 	mutex_lock(&priv->conf_mutex);
+
+	priv->vif = NULL;
+
 	rtl818x_iowrite16(priv, &priv->map->INT_MASK, 0);
 
 	reg = rtl818x_ioread8(priv, &priv->map->CMD);
@@ -1067,10 +1070,7 @@ exit:
 static void rtl8187_remove_interface(struct ieee80211_hw *dev,
 				     struct ieee80211_vif *vif)
 {
-	struct rtl8187_priv *priv = dev->priv;
-	mutex_lock(&priv->conf_mutex);
-	priv->vif = NULL;
-	mutex_unlock(&priv->conf_mutex);
+	/* Nothing to do */
 }
 
 static int rtl8187_config(struct ieee80211_hw *dev, u32 changed)
-- 
1.7.1


^ permalink raw reply related	[flat|nested] 18+ messages in thread

end of thread, other threads:[~2011-04-01  3:12 UTC | newest]

Thread overview: 18+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-26 21:19 [RFC PATCH] rtl8187: Fix led support for rfkill Wu Zhangjin
2011-03-26 21:19 ` Wu Zhangjin
2011-03-26 21:33 ` Hin-Tak Leung
2011-03-26 21:33   ` Hin-Tak Leung
2011-03-26 22:25   ` wu zhangjin
2011-03-27  0:55     ` Hin-Tak Leung
2011-03-27  0:55       ` Hin-Tak Leung
2011-03-27 22:47       ` Larry Finger
2011-03-27 22:47         ` Larry Finger
2011-03-28 15:40         ` Herton Ronaldo Krzesinski
2011-03-31 16:22           ` wu zhangjin
2011-03-31 16:22             ` wu zhangjin
2011-03-31 17:19             ` Herton Ronaldo Krzesinski
2011-04-01  3:12               ` wu zhangjin
2011-03-31 16:04         ` wu zhangjin
2011-03-31 16:04           ` wu zhangjin
2011-03-31 16:03       ` wu zhangjin
2011-03-31 16:03         ` wu zhangjin

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.