From: "John W. Linville" <linville@tuxdriver.com>
To: Felix Fietkau <nbd@openwrt.org>
Cc: linux-wireless@vger.kernel.org, lrodriguez@atheros.com,
greearb@candelatech.com
Subject: Re: [PATCH 2.6.39] ath9k: fix a regression in PS frame filter handling
Date: Tue, 10 May 2011 15:39:14 -0400 [thread overview]
Message-ID: <20110510193914.GF2520@tuxdriver.com> (raw)
In-Reply-To: <1304972747-11775-1-git-send-email-nbd@openwrt.org>
This doesn't seem to apply against wireless-2.6...
On Mon, May 09, 2011 at 10:25:47PM +0200, Felix Fietkau wrote:
> Only leave filtering enabled for AP or VLAN interfaces, clear the
> destination mask for all other interfaces.
>
> Signed-off-by: Felix Fietkau <nbd@openwrt.org>
> Reported-by: Ben Greear <greearb@candelatech.com>
> ---
> drivers/net/wireless/ath/ath9k/main.c | 5 +++++
> drivers/net/wireless/ath/ath9k/xmit.c | 6 +++++-
> 2 files changed, 10 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
> index 3de115d..3d999b7 100644
> --- a/drivers/net/wireless/ath/ath9k/main.c
> +++ b/drivers/net/wireless/ath/ath9k/main.c
> @@ -1778,6 +1778,11 @@ static int ath9k_sta_add(struct ieee80211_hw *hw,
> struct ieee80211_key_conf ps_key = { };
>
> ath_node_attach(sc, sta);
> +
> + if (vif->type != NL80211_IFTYPE_AP &&
> + vif->type != NL80211_IFTYPE_AP_VLAN)
> + return 0;
> +
> an->ps_key = ath_key_config(common, vif, sta, &ps_key);
>
> return 0;
> diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
> index 744779d..ee71d38 100644
> --- a/drivers/net/wireless/ath/ath9k/xmit.c
> +++ b/drivers/net/wireless/ath/ath9k/xmit.c
> @@ -1795,6 +1795,7 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
> struct sk_buff *skb = bf->bf_mpdu;
> struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
> struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
> + struct ieee80211_vif *vif = tx_info->control.vif;
> struct list_head bf_head;
> struct ath_atx_tid *tid = NULL;
> u8 tidno;
> @@ -1829,7 +1830,10 @@ static void ath_tx_start_dma(struct ath_softc *sc, struct ath_buf *bf,
> if (txctl->paprd)
> bf->bf_state.bfs_paprd_timestamp = jiffies;
>
> - if (tx_info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
> + if ((vif && vif->type != NL80211_IFTYPE_AP &&
> + vif->type != NL80211_IFTYPE_AP_VLAN) ||
> + !ieee80211_is_data(hdr->frame_control) ||
> + (tx_info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT))
> ath9k_hw_set_clrdmask(sc->sc_ah, bf->bf_desc, true);
>
> ath_tx_send_normal(sc, txctl->txq, tid, &bf_head);
> --
> 1.7.3.2
>
>
--
John W. Linville Someday the world will need a hero, and you
linville@tuxdriver.com might be all we have. Be ready.
next prev parent reply other threads:[~2011-05-10 19:45 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-09 20:25 [PATCH 2.6.39] ath9k: fix a regression in PS frame filter handling Felix Fietkau
2011-05-10 17:22 ` Ben Greear
2011-05-10 19:39 ` John W. Linville [this message]
2011-05-10 20:00 ` Felix Fietkau
2011-05-10 20:04 ` Ben Greear
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110510193914.GF2520@tuxdriver.com \
--to=linville@tuxdriver.com \
--cc=greearb@candelatech.com \
--cc=linux-wireless@vger.kernel.org \
--cc=lrodriguez@atheros.com \
--cc=nbd@openwrt.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).