---

yaml --- r: 134875 b: refs/heads/master c: d5c232f h: refs/heads/master i: 134873: fd099ce 134871: 19a2fd6 v: v3
git-mirror · Feb 27, 2009 · 8fed233 · 8fed233
1 parent 5d0a3e4
commit 8fed233
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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;