From patchwork Wed Aug 26 19:04:08 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: 44093 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 n7QJ4F5k012264 for ; Wed, 26 Aug 2009 19:04:16 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752869AbZHZTEM (ORCPT ); Wed, 26 Aug 2009 15:04:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752866AbZHZTEM (ORCPT ); Wed, 26 Aug 2009 15:04:12 -0400 Received: from mail-ew0-f206.google.com ([209.85.219.206]:42347 "EHLO mail-ew0-f206.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752804AbZHZTEL (ORCPT ); Wed, 26 Aug 2009 15:04:11 -0400 Received: by ewy2 with SMTP id 2so477259ewy.17 for ; Wed, 26 Aug 2009 12:04:12 -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=aQ57KzZ8JwQlLIcpp6C7VPvLGO3gX0xhMgtgNjYBRgg=; b=NkjWRRAiDn2eX/qLXF7FXCTcMwcKjoaYi3VLbxPO94TaKkLtCYg7ovPqUYRWjKiqrM o8x4BlS1SXm/G5Te/wV7aUwnxQXlvC0bAQa0A6xwuVH0pQWc7F/x+4W0dEWNo2zBDI3S WXhG6xHMCPgfs2NxsYbCrQOHv5O29P68zyKK8= 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=HaSsA9jfDlJVT2wLVNWarGQiYqNxIQBQqNY6mqP4Iw+fEAniStytgWXQKQB2r3x7b1 0FqWtGqhfrS3//wjQtqfMIT/U6QdQvUixSieAEAmnsKTlPczaOetIm9Hl0bhtrw2Bwwg t/6m6r5pNu2OdkEclPSy4vkuji0JuT2iXi+Kg= Received: by 10.210.34.20 with SMTP id h20mr2399450ebh.61.1251313451885; Wed, 26 Aug 2009 12:04:11 -0700 (PDT) Received: from ?192.168.8.42? (k19232.upc-k.chello.nl [62.108.19.232]) by mx.google.com with ESMTPS id 24sm180497eyx.45.2009.08.26.12.04.10 (version=SSLv3 cipher=RC4-MD5); Wed, 26 Aug 2009 12:04:10 -0700 (PDT) From: Ivo van Doorn To: John Linville Subject: [PATCH] rt2x00: Cleanup rt2x00mac_bss_info_changed() Date: Wed, 26 Aug 2009 21:04:08 +0200 User-Agent: KMail/1.9.10 Cc: "linux-wireless" , users@host1.serialmonkey.com MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200908262104.09230.IvDoorn@gmail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org Since patch "rt2x00: bss_info_changed() callback is allowed to sleep" the variable delayed wasn't used anymore. This means it can be removed along with the call to schedule_work which depended on that variable. Signed-off-by: Ivo van Doorn --- -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/wireless/rt2x00/rt2x00mac.c b/drivers/net/wireless/rt2x00/rt2x00mac.c index a91f316..929b85f 100644 --- a/drivers/net/wireless/rt2x00/rt2x00mac.c +++ b/drivers/net/wireless/rt2x00/rt2x00mac.c @@ -582,7 +582,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, { struct rt2x00_dev *rt2x00dev = hw->priv; struct rt2x00_intf *intf = vif_to_intf(vif); - unsigned int delayed = 0; int update_bssid = 0; /* @@ -645,13 +644,6 @@ void rt2x00mac_bss_info_changed(struct ieee80211_hw *hw, */ if (changes & ~(BSS_CHANGED_ASSOC | BSS_CHANGED_HT)) rt2x00lib_config_erp(rt2x00dev, intf, bss_conf); - - spin_lock(&intf->lock); - if (delayed) { - intf->delayed_flags |= delayed; - schedule_work(&rt2x00dev->intf_work); - } - spin_unlock(&intf->lock); } EXPORT_SYMBOL_GPL(rt2x00mac_bss_info_changed);