diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-08-22 08:36:41 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-08-22 08:37:08 +0200 |
| commit | e133fae263090f5795b8024a4024b81e06770132 (patch) | |
| tree | 9a87af089f1aa4914e1a0672aa8f71338792dc55 /net | |
| parent | 27b3eb9c06a7193bdc9800cd00764a130343bc8a (diff) | |
| download | op-kernel-dev-e133fae263090f5795b8024a4024b81e06770132.zip op-kernel-dev-e133fae263090f5795b8024a4024b81e06770132.tar.gz | |
mac80211: minstrel_ht: don't use control.flags in TX status path
Sujith reports that my commit af61a165187bb94b1dc7628ef815c23d0eacf40b
("mac80211: add control port protocol TX control flag") broke ath9k
(aggregation). The reason is that I made minstrel_ht use the flag in
the TX status path, where it can have been overwritten by the driver.
Since we have no more space in info->flags, revert that part of the
change for now, until we can reshuffle the flags or so.
Reported-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/rc80211_minstrel_ht.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/rc80211_minstrel_ht.c b/net/mac80211/rc80211_minstrel_ht.c index 9eff382..c397ff5 100644 --- a/net/mac80211/rc80211_minstrel_ht.c +++ b/net/mac80211/rc80211_minstrel_ht.c @@ -439,13 +439,12 @@ minstrel_aggr_check(struct ieee80211_sta *pubsta, struct sk_buff *skb) { struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data; struct sta_info *sta = container_of(pubsta, struct sta_info, sta); - struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); u16 tid; if (unlikely(!ieee80211_is_data_qos(hdr->frame_control))) return; - if (unlikely(info->control.flags & IEEE80211_TX_CTRL_PORT_CTRL_PROTO)) + if (unlikely(skb->protocol == cpu_to_be16(ETH_P_PAE))) return; tid = *ieee80211_get_qos_ctl(hdr) & IEEE80211_QOS_CTL_TID_MASK; |
