Return-path: Received: from charlotte.tuxdriver.com ([70.61.120.58]:58969 "EHLO smtp.tuxdriver.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757190Ab2BHTqf (ORCPT ); Wed, 8 Feb 2012 14:46:35 -0500 Date: Wed, 8 Feb 2012 14:44:54 -0500 From: "John W. Linville" To: Felix Fietkau Cc: linux-wireless@vger.kernel.org, johannes@sipsolutions.net, arend@broadcom.com Subject: Re: [PATCH] mac80211: do not call rate control .tx_status before .rate_init Message-ID: <20120208194453.GC2929@tuxdriver.com> (sfid-20120208_204638_435884_FD5D28E4) References: <1328725031-35464-1-git-send-email-nbd@openwrt.org> <20120208192536.GB2929@tuxdriver.com> <4F32CF18.4010300@openwrt.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <4F32CF18.4010300@openwrt.org> Sender: linux-wireless-owner@vger.kernel.org List-ID: On Wed, Feb 08, 2012 at 08:38:00PM +0100, Felix Fietkau wrote: > On 2012-02-08 8:25 PM, John W. Linville wrote: > > On Wed, Feb 08, 2012 at 07:17:11PM +0100, Felix Fietkau wrote: > >> Most rate control implementations assume .get_rate and .tx_status are only > >> called once the per-station data has been fully initialized. > >> minstrel_ht crashes if this assumption is violated. > >> > >> Signed-off-by: Felix Fietkau > >> Tested-by: Arend van Spriel > >> --- > >> net/mac80211/rate.h | 2 +- > >> 1 files changed, 1 insertions(+), 1 deletions(-) > >> > >> diff --git a/net/mac80211/rate.h b/net/mac80211/rate.h > >> index 5fc3135..fbb1efd 100644 > >> --- a/net/mac80211/rate.h > >> +++ b/net/mac80211/rate.h > >> @@ -37,7 +37,7 @@ static inline void rate_control_tx_status(struct ieee80211_local *local, > >> struct ieee80211_sta *ista = &sta->sta; > >> void *priv_sta = sta->rate_ctrl_priv; > >> > >> - if (!ref) > >> + if (!ref || !test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) > >> return; > >> > >> ref->ops->tx_status(ref->priv, sband, ista, priv_sta, skb); > > > > Any reason not to apply this for 3.3? Or stable? > I think 3.3 doesn't have that sta flag, the issue was probably > introduced with the 3.4 changes. > I don't remember something like this appearing in earlier versions. Cool, thanks. -- John W. Linville Someday the world will need a hero, and you linville@tuxdriver.com might be all we have. Be ready.