From patchwork Sat Mar 26 21:19:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhangjin Wu X-Patchwork-Id: 88481 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D3482B6F9C for ; Sun, 27 Mar 2011 08:20:41 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752410Ab1CZVUM (ORCPT ); Sat, 26 Mar 2011 17:20:12 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:46824 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751822Ab1CZVUK (ORCPT ); Sat, 26 Mar 2011 17:20:10 -0400 Received: by pwi15 with SMTP id 15so334488pwi.19 for ; Sat, 26 Mar 2011 14:20:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer; bh=fMmd0Uk5VZWpuC8rnprJQ1tIM1Jxp9BbgPIwKt6rPm4=; b=IarosUg0R531mqaWi5Duiy5QJgWQrRi60PJxAJgOttOTYqHMDEXbxeRC+R+osuywC4 m7gwqTG7n6YIrDpJeDFkHb+gfJbafncdzSCMKFIeCA3nXbmujobDgTrWsSLaOykuAFSm DYtl8KVJwkYUGr07S2vkXGRfDxvAvoEEjXA54= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=stPYlrSdIJSkgAglhJQ65DeePlHuRPr6mpk+JAFD6WWQ5xrWtY4vFd7iNG28XqnKe+ tkccmzcS6881yHWnKOirHI18b5yp8/HuDLMIf1cp/D24L4K6NHtnSYkS64f4A775Zl4+ nQi5zOhv1ptZNq281Y9xWODPDcQJ5dX5dTFQM= Received: by 10.142.161.10 with SMTP id j10mr103072wfe.250.1301174409945; Sat, 26 Mar 2011 14:20:09 -0700 (PDT) Received: from localhost.localdomain ([221.221.252.68]) by mx.google.com with ESMTPS id d35sm3351264wfj.21.2011.03.26.14.20.05 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 26 Mar 2011 14:20:08 -0700 (PDT) From: Wu Zhangjin To: Herton Ronaldo Krzesinski , Hin-Tak Leung , Larry Finger Cc: linux-wireless@vger.kernel.org, netdev@vger.kernel.org, Wu Zhangjin Subject: [RFC PATCH] rtl8187: Fix led support for rfkill Date: Sun, 27 Mar 2011 05:19:54 +0800 Message-Id: <1301174394-12642-1-git-send-email-wuzhangjin@gmail.com> X-Mailer: git-send-email 1.7.1 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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)