From 64bd4b693f2d0b59673086e9c510068d5ad47cee Mon Sep 17 00:00:00 2001 From: Ron Rindjunsky Date: Thu, 29 Nov 2007 10:35:53 +0200 Subject: mac80211: move A-MSDU identifier to flags This patch moves u8 amsdu_frame in ieee80211_txrx_data to the flags section as IEEE80211_TXRXD_RX_AMSDU Signed-off-by: Ron Rindjunsky Signed-off-by: John W. Linville Signed-off-by: David S. Miller --- net/mac80211/rx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'net/mac80211/rx.c') diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 4525d7332c8..0020e409e57 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) /* frame has qos control */ tid = qc[0] & QOS_CONTROL_TID_MASK; if (qc[0] & IEEE80211_QOS_CONTROL_A_MSDU_PRESENT) - rx->u.rx.amsdu_frame = 1; + rx->flags |= IEEE80211_TXRXD_RX_AMSDU; else - rx->u.rx.amsdu_frame = 0; + rx->flags &= ~IEEE80211_TXRXD_RX_AMSDU; } else { if (unlikely((rx->fc & IEEE80211_FCTL_FTYPE) == IEEE80211_FTYPE_MGMT)) { /* Separate TID for management frames */ @@ -1221,7 +1221,7 @@ ieee80211_rx_h_amsdu(struct ieee80211_txrx_data *rx) if (unlikely(!WLAN_FC_DATA_PRESENT(fc))) return TXRX_DROP; - if (!rx->u.rx.amsdu_frame) + if (!(rx->flags & IEEE80211_TXRXD_RX_AMSDU)) return TXRX_CONTINUE; err = ieee80211_data_to_8023(rx); -- cgit v1.2.3-70-g09d2