From patchwork Mon Nov 30 17:13:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lennert Buytenhek X-Patchwork-Id: 63736 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 nAUHECNt017718 for ; Mon, 30 Nov 2009 17:14:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753289AbZK3RNw (ORCPT ); Mon, 30 Nov 2009 12:13:52 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753285AbZK3RNv (ORCPT ); Mon, 30 Nov 2009 12:13:51 -0500 Received: from fw.wantstofly.org ([80.101.37.227]:57164 "EHLO mail.wantstofly.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753284AbZK3RNu (ORCPT ); Mon, 30 Nov 2009 12:13:50 -0500 Received: by mail.wantstofly.org (Postfix, from userid 500) id 455A718E201; Mon, 30 Nov 2009 18:13:56 +0100 (CET) Date: Mon, 30 Nov 2009 18:13:56 +0100 From: Lennert Buytenhek To: "John W. Linville" , linux-wireless@vger.kernel.org Subject: [PATCH 11/12] mwl8k: don't overwrite mwl8k_vif::bssid until after disassociation Message-ID: <20091130171356.GN20214@mail.wantstofly.org> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.4.2.2i 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/mwl8k.c b/drivers/net/wireless/mwl8k.c index ca6162b..f80cef9 100644 --- a/drivers/net/wireless/mwl8k.c +++ b/drivers/net/wireless/mwl8k.c @@ -3025,9 +3025,6 @@ static void mwl8k_bss_info_changed(struct ieee80211_hw *hw, struct mwl8k_vif *mwl8k_vif = MWL8K_VIF(vif); int rc; - if (changed & BSS_CHANGED_BSSID) - memcpy(mwl8k_vif->bssid, info->bssid, ETH_ALEN); - if ((changed & BSS_CHANGED_ASSOC) == 0) return; @@ -3041,6 +3038,8 @@ static void mwl8k_bss_info_changed(struct ieee80211_hw *hw, memcpy(&mwl8k_vif->bss_info, info, sizeof(struct ieee80211_bss_conf)); + memcpy(mwl8k_vif->bssid, info->bssid, ETH_ALEN); + /* Install rates */ rc = mwl8k_update_rateset(hw, vif); if (rc)