From patchwork Thu Nov 12 23:35:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Lamparter X-Patchwork-Id: 59676 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 nACNan8l010319 for ; Thu, 12 Nov 2009 23:36:50 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755541AbZKLXfz (ORCPT ); Thu, 12 Nov 2009 18:35:55 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1755389AbZKLXfz (ORCPT ); Thu, 12 Nov 2009 18:35:55 -0500 Received: from mail-bw0-f227.google.com ([209.85.218.227]:34769 "EHLO mail-bw0-f227.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755413AbZKLXfw (ORCPT ); Thu, 12 Nov 2009 18:35:52 -0500 Received: by bwz27 with SMTP id 27so2850952bwz.21 for ; Thu, 12 Nov 2009 15:35:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=domainkey-signature:received:received:received:from:to:subject:date :user-agent:cc:references:in-reply-to:mime-version:content-type :content-transfer-encoding:message-id; bh=M1zY6KE8Cpk9fHS6dZ0j9doZRcnasSbifHH50ArkgzY=; b=BX9wNrFXanicFsyLvUVSOXIkFwWyKLipRYGPfEzg7v7uRpQxyNTHoj1wWFbBq3xS6n Hy+O8RBRcRHQOT8RlpsBGcAwntT83C5LS+TE8hYonryTHd6lLbV0NunNcbpKC+7RHWVl u2UJbSor30D7zFf3bS7oSzmrPl2pKwOB8gToI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=googlemail.com; s=gamma; h=from:to:subject:date:user-agent:cc:references:in-reply-to :mime-version:content-type:content-transfer-encoding:message-id; b=VzMo+yRsglNlrMD6APMSOmbYP0gLfAK0BqsGBBIlCkS9aiIvnUm8T62CnycqFg/dI3 k90inzhUvOwJXu2OgRoLlh1ebBFmdd5xWaMYyw6NFdRcOqjo6Wabi1hj84XvzAXwLhy3 AIaWMyyOw80hrRg9TP+tEJVumjKGSyTnNZcPA= Received: by 10.204.151.209 with SMTP id d17mr4014614bkw.120.1258068956639; Thu, 12 Nov 2009 15:35:56 -0800 (PST) Received: from debian64.daheim (p5B16D8C0.dip.t-dialin.net [91.22.216.192]) by mx.google.com with ESMTPS id 16sm1102017fxm.8.2009.11.12.15.35.55 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 12 Nov 2009 15:35:56 -0800 (PST) Received: from debian64.daheim ([192.168.0.4] helo=debian64.localnet ident=chuck) by debian64.daheim with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1N8jCl-000572-FQ; Fri, 13 Nov 2009 00:35:55 +0100 From: Christian Lamparter To: Adam Wozniak Subject: Re: compat-wireless and minstrel Date: Fri, 13 Nov 2009 00:35:52 +0100 User-Agent: KMail/1.12.2 (Linux/2.6.32-rc6-wl; KDE/4.3.2; x86_64; ; ) Cc: Derek Smithies , linux-wireless@vger.kernel.org, nbd@openwrt.org References: <4AF0D54D.4090303@irobot.com> <200911122103.27455.chunkeey@googlemail.com> <4AFC8E4F.5090307@irobot.com> In-Reply-To: <4AFC8E4F.5090307@irobot.com> MIME-Version: 1.0 Message-Id: <200911130035.52308.chunkeey@googlemail.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index fbffce9..7c6c170 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -246,9 +246,12 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, if (!channel || channel->flags & IEEE80211_CHAN_DISABLED) return; + /* make sure mandatory rates are always added */ + supp_rates = ieee80211_mandatory_rates(local, band); + if (sdata->vif.type == NL80211_IFTYPE_ADHOC && elems->supp_rates && memcmp(mgmt->bssid, sdata->u.ibss.bssid, ETH_ALEN) == 0) { - supp_rates = ieee80211_sta_get_rates(local, elems, band); + supp_rates |= ieee80211_sta_get_rates(local, elems, band); rcu_read_lock(); @@ -257,9 +260,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, u32 prev_rates; prev_rates = sta->sta.supp_rates[band]; - /* make sure mandatory rates are always added */ - sta->sta.supp_rates[band] = supp_rates | - ieee80211_mandatory_rates(local, band); + sta->sta.supp_rates[band] = supp_rates; #ifdef CONFIG_MAC80211_IBSS_DEBUG if (sta->sta.supp_rates[band] != prev_rates) @@ -272,6 +273,7 @@ static void ieee80211_rx_bss_info(struct ieee80211_sub_if_data *sdata, (unsigned long long) supp_rates, (unsigned long long) sta->sta.supp_rates[band]); #endif + rate_control_rate_init(sta); } else ieee80211_ibss_add_sta(sdata, mgmt->bssid, mgmt->sa, supp_rates);