From patchwork Mon Aug 17 16:53:24 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivo van Doorn X-Patchwork-Id: 42071 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n7HGuXNB027562 for ; Mon, 17 Aug 2009 16:56:33 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932077AbZHQQ42 (ORCPT ); Mon, 17 Aug 2009 12:56:28 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757574AbZHQQ42 (ORCPT ); Mon, 17 Aug 2009 12:56:28 -0400 Received: from mail-ew0-f214.google.com ([209.85.219.214]:64136 "EHLO mail-ew0-f214.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756895AbZHQQ41 (ORCPT ); Mon, 17 Aug 2009 12:56:27 -0400 Received: by ewy10 with SMTP id 10so3097890ewy.37 for ; Mon, 17 Aug 2009 09:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:subject:date :user-agent:cc:mime-version:content-type:content-transfer-encoding :content-disposition:message-id; bh=JMRk0o6pFJxEAK2kwDy0g+Ny0tfb5/gYOchznNrnJRw=; b=Or1VCymgQUnZdZh3H+HC/x8qVkdH3KW5tbHI9GQDppqEhIsXtdaSIFyBNebHFgI1xd 1rPHRaf+f3mtV5L85Mi2aa9dCvXW9SIMFLrUGBwr/xr6BkzvJ7TXKFEO5/pR1Mb4VtpY vYMPu8rEEkHfcuS11BW0E5ZifLzgAdLxiawKY= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:subject:date:user-agent:cc:mime-version:content-type :content-transfer-encoding:content-disposition:message-id; b=H+Y9mRYvh3J5BRWrG0LJVfjWoOjiOJnvwF7byVdp7SXLExWnCCSPdxGFRCWToFqxzR khR+KZ8c7vj2VbTKImT46fXGq8iSyC0n/mQdl/udJgl13YC+f2GXL2CkKNRs5Mp+RClC b8vZc7Z6B4HeeF+kRJlYBOI1SX8k7FTuEbg3Y= Received: by 10.210.133.17 with SMTP id g17mr3878258ebd.93.1250528188417; Mon, 17 Aug 2009 09:56:28 -0700 (PDT) Received: from ?192.168.8.42? (k19232.upc-k.chello.nl [62.108.19.232]) by mx.google.com with ESMTPS id 28sm10357786eye.44.2009.08.17.09.56.26 (version=SSLv3 cipher=RC4-MD5); Mon, 17 Aug 2009 09:56:26 -0700 (PDT) From: Ivo van Doorn To: John Linville Subject: [PATCH 1/7] rt2x00: Fix RFKILL polling Date: Mon, 17 Aug 2009 18:53:24 +0200 User-Agent: KMail/1.9.10 Cc: "linux-wireless" , users@host1.serialmonkey.com MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200908171853.24256.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org The rfkill_poll callback function in the drivers check a bit to see if the RFKILL key has been pressed. However when the bit is set it means the radio is active and the device can be used. The wiphy_rfkill_set_hw_state() function expects the inversed, so '1' must be send when the radio must be disabled. Signed-off-by: Ivo van Doorn --- drivers/net/wireless/rt2x00/rt2x00mac.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index cb7b6d4..b27a250 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -704,8 +704,8 @@ EXPORT_SYMBOL_GPL(rt2x00mac_conf_tx); void rt2x00mac_rfkill_poll(struct ieee80211_hw *hw) { struct rt2x00_dev *rt2x00dev = hw->priv; - bool blocked = !!rt2x00dev->ops->lib->rfkill_poll(rt2x00dev); + bool active = !!rt2x00dev->ops->lib->rfkill_poll(rt2x00dev); - wiphy_rfkill_set_hw_state(hw->wiphy, blocked); + wiphy_rfkill_set_hw_state(hw->wiphy, !active); } EXPORT_SYMBOL_GPL(rt2x00mac_rfkill_poll);