Return-path: Received: from mail-bw0-f46.google.com ([209.85.214.46]:54469 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753680Ab1EFNIc (ORCPT ); Fri, 6 May 2011 09:08:32 -0400 Received: by bwz15 with SMTP id 15so2489346bwz.19 for ; Fri, 06 May 2011 06:08:30 -0700 (PDT) From: Christian Lamparter To: Felix Fietkau Subject: Re: [PATCH 2.6.39] mac80211: always clear PS filtering for non-AP interfaces Date: Fri, 6 May 2011 15:08:19 +0200 Cc: linux-wireless@vger.kernel.org, linville@tuxdriver.com, johannes@sipsolutions.net, greearb@candelatech.com References: <1304642474-32935-1-git-send-email-nbd@openwrt.org> In-Reply-To: <1304642474-32935-1-git-send-email-nbd@openwrt.org> MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Message-Id: <201105061508.20010.chunkeey@googlemail.com> (sfid-20110506_150835_892096_A7CD4EE4) Sender: linux-wireless-owner@vger.kernel.org List-ID: On Friday 06 May 2011 02:41:14 Felix Fietkau wrote: > PS filtering is only useful in AP mode and by setting the flags in mac80211, > vif mode checks do not have to be added to every single driver supporting > this. > Fixes part of a regression introduced in commit 93ae2dd2 > "ath9k: assign keycache slots to unencrypted stations" > > Signed-off-by: Felix Fietkau > Reported-by: Ben Greear > --- > net/mac80211/tx.c | 3 +++ > 1 files changed, 3 insertions(+), 0 deletions(-) > > diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c > index e1a39ed..b301216 100644 > --- a/net/mac80211/tx.c > +++ b/net/mac80211/tx.c > @@ -1267,6 +1267,9 @@ ieee80211_tx_prepare(struct ieee80211_sub_if_data *sdata, > info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; > else if (test_and_clear_sta_flags(tx->sta, WLAN_STA_CLEAR_PS_FILT)) > info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; > + else if (sdata->vif.type != NL80211_IFTYPE_AP && > + sdata->vif.type != NL80211_IFTYPE_AP_VLAN) > + info->flags |= IEEE80211_TX_CTL_CLEAR_PS_FILT; > > hdrlen = ieee80211_hdrlen(hdr->frame_control); > if (skb->len > hdrlen + sizeof(rfc1042_header) + 2) { > uh, I think this will break p54* powersave in station mode. But why do we set it anyway? It's not like the AP is in PS mode, right? Regards, Chr