aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 4525d7332c88..0020e409e57d 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -244,9 +244,9 @@ ieee80211_rx_h_parse_qos(struct ieee80211_txrx_data *rx)
244 /* frame has qos control */ 244 /* frame has qos control */
245 tid = qc[0] & QOS_CONTROL_TID_MASK; 245 tid = qc[0] & QOS_CONTROL_TID_MASK;
246 if (qc[0] & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT) 246 if (qc[0] & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT)
247 rx->u.rx.amsdu_frame = 1; 247 rx->flags |= IEEE80211_TXRXD_RX_AMSDU;
248 else 248 else
249 rx->u.rx.amsdu_frame = 0; 249 rx->flags &= ~IEEE80211_TXRXD_RX_AMSDU;
250 } else { 250 } else {
251 if (unlikely((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)) { 251 if (unlikely((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)) {
252 /* Separate TID for management frames */ 252 /* Separate TID for management frames */
@@ -1221,7 +1221,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx)
1221 if (unlikely(!WLAN_FC_DATA_PRESENT(fc))) 1221 if (unlikely(!WLAN_FC_DATA_PRESENT(fc)))
1222 return TXRX_DROP; 1222 return TXRX_DROP;
1223 1223
1224 if (!rx->u.rx.amsdu_frame) 1224 if (!(rx->flags & IEEE80211_TXRXD_RX_AMSDU))
1225 return TXRX_CONTINUE; 1225 return TXRX_CONTINUE;
1226 1226
1227 err = ieee80211_data_to_8023(rx); 1227 err = ieee80211_data_to_8023(rx);