From patchwork Tue Dec 7 21:35:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Cardona X-Patchwork-Id: 384202 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oB7LghTs025492 for ; Tue, 7 Dec 2010 21:42:43 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753216Ab0LGVmm (ORCPT ); Tue, 7 Dec 2010 16:42:42 -0500 Received: from mail-iw0-f172.google.com ([209.85.214.172]:60442 "EHLO mail-iw0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753133Ab0LGVmm (ORCPT ); Tue, 7 Dec 2010 16:42:42 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Dec 2010 21:42:44 +0000 (UTC) X-Greylist: delayed 394 seconds by postgrey-1.27 at vger.kernel.org; Tue, 07 Dec 2010 16:42:42 EST Received: by iwn40 with SMTP id 40so435422iwn.3 for ; Tue, 07 Dec 2010 13:42:41 -0800 (PST) Received: by 10.231.157.14 with SMTP id z14mr8267613ibw.85.1291757766655; Tue, 07 Dec 2010 13:36:06 -0800 (PST) Received: from localhost.localdomain (adsl-99-114-136-65.dsl.pltn13.sbcglobal.net [99.114.136.65]) by mx.google.com with ESMTPS id d21sm6320467ibg.9.2010.12.07.13.36.04 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Dec 2010 13:36:05 -0800 (PST) From: Javier Cardona To: "John W. Linville" Cc: Javier Cardona , Steve Derosier , devel@lists.open80211s.org, linux-wireless@vger.kernel.org, Jiri Slaby , Nick Kossifidis , "Luis R. Rodriguez" , Bob Copeland Subject: [PATCH 1/3] ath5k: Fix beaconing in mesh mode Date: Tue, 7 Dec 2010 13:35:55 -0800 Message-Id: <1291757755-29831-1-git-send-email-javier@cozybit.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <20101207205812.GK2700@tuxdriver.com> References: <20101207205812.GK2700@tuxdriver.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 0a7071a..6c35730 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -1913,8 +1913,9 @@ ath5k_beacon_send(struct ath5k_softc *sc) /* NB: hw still stops DMA, so proceed */ } - /* refresh the beacon for AP mode */ - if (sc->opmode == NL80211_IFTYPE_AP) + /* refresh the beacon for AP or MESH mode */ + if (sc->opmode == NL80211_IFTYPE_AP || + sc->opmode == NL80211_IFTYPE_MESH_POINT) ath5k_beacon_update(sc->hw, vif); ath5k_hw_set_txdp(ah, sc->bhalq, bf->daddr); @@ -2977,7 +2978,8 @@ static int ath5k_add_interface(struct ieee80211_hw *hw, /* Assign the vap/adhoc to a beacon xmit slot. */ if ((avf->opmode == NL80211_IFTYPE_AP) || - (avf->opmode == NL80211_IFTYPE_ADHOC)) { + (avf->opmode == NL80211_IFTYPE_ADHOC) || + (avf->opmode == NL80211_IFTYPE_MESH_POINT)) { int slot; WARN_ON(list_empty(&sc->bcbuf));