From patchwork Mon May 11 09:53:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Johannes Berg X-Patchwork-Id: 6375301 X-Patchwork-Delegate: johannes@sipsolutions.net Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 00B24BEEE1 for ; Mon, 11 May 2015 09:53:35 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D99120384 for ; Mon, 11 May 2015 09:53:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0F28020377 for ; Mon, 11 May 2015 09:53:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752824AbbEKJxb (ORCPT ); Mon, 11 May 2015 05:53:31 -0400 Received: from s3.sipsolutions.net ([5.9.151.49]:60410 "EHLO sipsolutions.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750774AbbEKJxa (ORCPT ); Mon, 11 May 2015 05:53:30 -0400 Received: by sipsolutions.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.85) (envelope-from ) id 1YrkOv-0006tq-Hw; Mon, 11 May 2015 11:53:29 +0200 Message-ID: <1431338007.1964.16.camel@sipsolutions.net> Subject: Re: [PATCH] mac80211: IBSS, clear fast_sta when update rates From: Johannes Berg To: Janusz Dziedzic Cc: linux-wireless@vger.kernel.org Date: Mon, 11 May 2015 11:53:27 +0200 In-Reply-To: <1431337921.1964.15.camel@sipsolutions.net> (sfid-20150511_115210_912154_EBE83A3A) References: <1431337193-17472-1-git-send-email-janusz.dziedzic@tieto.com> (sfid-20150511_113957_922464_EF6D0870) <1431337921.1964.15.camel@sipsolutions.net> (sfid-20150511_115210_912154_EBE83A3A) X-Mailer: Evolution 3.12.9-1+b1 Mime-Version: 1.0 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Mon, 2015-05-11 at 11:52 +0200, Johannes Berg wrote: > On Mon, 2015-05-11 at 11:39 +0200, Janusz Dziedzic wrote: > > This is required to handle sta.wme correctly > > after update rates (eg. when using HT/VHT) when > > driver using IEEE80211_HW_SUPPORT_FAST_XMIT. > > Wouldn't you want to check, so it can be re-assigned? i.e. something like johannes --- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index bfef1b215050..7e62183525aa 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -1031,8 +1031,11 @@ static void ieee80211_update_sta_info(struct ieee80211_sub_if_data *sdata, } } - if (sta && elems->wmm_info && local->hw.queues >= IEEE80211_NUM_ACS) + if (sta && !sta->sta.wme && elems->wmm_info && + local->hw.queues >= IEEE80211_NUM_ACS) { sta->sta.wme = true; + ieee80211_check_fast_xmit(sta); + } if (sta && elems->ht_operation && elems->ht_cap_elem && sdata->u.ibss.chandef.width != NL80211_CHAN_WIDTH_20_NOHT &&