From 8fed233d92d75692395210f416e47a4cb924a6ac Mon Sep 17 00:00:00 2001 From: Vasanthakumar Thiagarajan Date: Wed, 18 Feb 2009 10:22:02 +0530 Subject: [PATCH] --- yaml --- r: 134875 b: refs/heads/master c: d5c232ff9bd5c0aa79b65a0d21cf9b944d7bf218 h: refs/heads/master i: 134873: fd099ce28bbdecdc178dee7e0536b63c6169c7d6 134871: 19a2fd65f4ef151ac325a37c49f532068b1bd4f3 v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath9k/rc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c9042b3e5955..0ce35baea345 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a77b855245541823b49999a27245ad7428879096 +refs/heads/master: d5c232ff9bd5c0aa79b65a0d21cf9b944d7bf218 diff --git a/trunk/drivers/net/wireless/ath9k/rc.c b/trunk/drivers/net/wireless/ath9k/rc.c index 6b4731c24736..0e3e2b7dd2ec 100644 --- a/trunk/drivers/net/wireless/ath9k/rc.c +++ b/trunk/drivers/net/wireless/ath9k/rc.c @@ -1535,7 +1535,8 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband, tx_info_priv->tx.ts_longretry); /* Check if aggregation has to be enabled for this tid */ - if (conf_is_ht(&sc->hw->conf)) { + if (conf_is_ht(&sc->hw->conf) && + !(skb->protocol == cpu_to_be16(ETH_P_PAE))) { if (ieee80211_is_data_qos(fc)) { u8 *qc, tid; struct ath_node *an;