From patchwork Tue Oct 20 20:21:48 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rui Paulo X-Patchwork-Id: 55011 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 n9KKLruR029519 for ; Tue, 20 Oct 2009 20:21:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751987AbZJTUVs (ORCPT ); Tue, 20 Oct 2009 16:21:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752068AbZJTUVs (ORCPT ); Tue, 20 Oct 2009 16:21:48 -0400 Received: from mail-fx0-f218.google.com ([209.85.220.218]:33641 "EHLO mail-fx0-f218.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751704AbZJTUVr (ORCPT ); Tue, 20 Oct 2009 16:21:47 -0400 Received: by fxm18 with SMTP id 18so6877661fxm.37 for ; Tue, 20 Oct 2009 13:21:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:mime-version:content-type:content-disposition:user-agent; bh=kasAHZK9vkuP2ZZfh6hMW8AV4cthTWLeNQ1QCccOs3s=; b=JK78aKQZnw0DIfuyKIPyge6gwkDqlrIYRwUkm72Nkj6VGMoDfJBW1a/Y++JkTHXSzs hyH25VKEMiYyhfZZ6ihkegxpBP0scWiq/QtD9INt1TzBZ+7pOPzTNloeak2MneEmwqBw UZ6VCl73H9IWE9i34buEPG84Tv9vZ3Z3vas9Q= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:mime-version:content-type :content-disposition:user-agent; b=b9Aoci/7pdvzxxlIzUngVM6+0yHSEKuEHwlMyBYTydJ2Wse2UWdexIRbZhzeURf3ks k/dWNtLYOjjM5eA8v7j0MKFVthM7Y/CeaG6GLO6aSQfr4avmCQ7VjvYaFcQUQo+b5QbR x8ZDVm/VXlz+ao9jmIg25WQc41mG4FutBfsnk= Received: by 10.204.20.82 with SMTP id e18mr7001754bkb.168.1256070111260; Tue, 20 Oct 2009 13:21:51 -0700 (PDT) Received: from localhost ([83.144.140.8]) by mx.google.com with ESMTPS id 13sm35136bwz.2.2009.10.20.13.21.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 20 Oct 2009 13:21:50 -0700 (PDT) Date: Tue, 20 Oct 2009 21:21:48 +0100 From: Rui Paulo To: linux-wireless@vger.kernel.org Cc: javier@cozybit.com, John Linville Subject: [PATCH] mesh: use set_bit() to set MESH_WORK_HOUSEKEEPING. Message-ID: <20091020202148.GA29602@asus-p5b.lan> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/net/mac80211/mesh.c b/net/mac80211/mesh.c index f7364e5..9a73389 100644 --- a/net/mac80211/mesh.c +++ b/net/mac80211/mesh.c @@ -50,7 +50,7 @@ static void ieee80211_mesh_housekeeping_timer(unsigned long data) struct ieee80211_local *local = sdata->local; struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; - ifmsh->wrkq_flags |= MESH_WORK_HOUSEKEEPING; + set_bit(MESH_WORK_HOUSEKEEPING, &ifmsh->wrkq_flags); if (local->quiescing) { set_bit(TMR_RUNNING_HK, &ifmsh->timers_running); @@ -480,7 +480,7 @@ void ieee80211_start_mesh(struct ieee80211_sub_if_data *sdata) struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; struct ieee80211_local *local = sdata->local; - ifmsh->wrkq_flags |= MESH_WORK_HOUSEKEEPING; + set_bit(MESH_WORK_HOUSEKEEPING, &ifmsh->wrkq_flags); ieee80211_queue_work(&local->hw, &ifmsh->work); sdata->vif.bss_conf.beacon_int = MESH_DEFAULT_BEACON_INTERVAL; ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON |