From patchwork Wed Oct 7 00:44:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Rodriguez X-Patchwork-Id: 52107 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 n970l13G022833 for ; Wed, 7 Oct 2009 00:47:01 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758507AbZJGApM (ORCPT ); Tue, 6 Oct 2009 20:45:12 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758517AbZJGApM (ORCPT ); Tue, 6 Oct 2009 20:45:12 -0400 Received: from bombadil.infradead.org ([18.85.46.34]:35350 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758405AbZJGApL (ORCPT ); Tue, 6 Oct 2009 20:45:11 -0400 Received: from mcgrof by bombadil.infradead.org with local (Exim 4.69 #1 (Red Hat Linux)) id 1MvKdu-0000J9-C2; Wed, 07 Oct 2009 00:44:34 +0000 From: "Luis R. Rodriguez" To: linville@tuxdriver.com Cc: linux-wireless@vger.kernel.org, "Luis R. Rodriguez" Subject: [PATCH 6/7] ath5k: fix regression which triggers an SME join upon assoc Date: Tue, 6 Oct 2009 20:44:33 -0400 Message-Id: <1254876274-1145-7-git-send-email-lrodriguez@atheros.com> X-Mailer: git-send-email 1.6.2.rc1.3.g81d3f In-Reply-To: <1254876274-1145-1-git-send-email-lrodriguez@atheros.com> References: <1254876274-1145-1-git-send-email-lrodriguez@atheros.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/pcu.c b/drivers/net/wireless/ath/ath5k/pcu.c index 2ab9c0e..64fc1eb 100644 --- a/drivers/net/wireless/ath/ath5k/pcu.c +++ b/drivers/net/wireless/ath/ath5k/pcu.c @@ -295,11 +295,11 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah) */ ath5k_hw_reg_write(ah, get_unaligned_le32(common->curbssid), - AR_BSSMSKL); + AR5K_BSS_ID0); ath5k_hw_reg_write(ah, get_unaligned_le16(common->curbssid + 4) | ((common->curaid & 0x3fff) << AR5K_BSS_ID1_AID_S), - AR_BSSMSKU); + AR5K_BSS_ID1); if (common->curaid == 0) { ath5k_hw_disable_pspoll(ah);