diff options
author | Ron Rindjunsky <ron.rindjunsky@intel.com> | 2007-11-29 03:35:53 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:55:34 -0500 |
commit | 64bd4b693f2d0b59673086e9c510068d5ad47cee (patch) | |
tree | 459ecf549453d6fe90c31f8765d9b49468847de3 /net/mac80211/ieee80211_i.h | |
parent | d3c990fb26b78f60614885d9ecaf7b7686b7b098 (diff) |
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 <ron.rindjunsky@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 2dcb9425fe8f..b54ed5fe4aa3 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -123,6 +123,7 @@ typedef enum { | |||
123 | /* frame is destined to interface currently processed (incl. multicast frames) */ | 123 | /* frame is destined to interface currently processed (incl. multicast frames) */ |
124 | #define IEEE80211_TXRXD_RXRA_MATCH BIT(5) | 124 | #define IEEE80211_TXRXD_RXRA_MATCH BIT(5) |
125 | #define IEEE80211_TXRXD_TX_INJECTED BIT(6) | 125 | #define IEEE80211_TXRXD_TX_INJECTED BIT(6) |
126 | #define IEEE80211_TXRXD_RX_AMSDU BIT(7) | ||
126 | struct ieee80211_txrx_data { | 127 | struct ieee80211_txrx_data { |
127 | struct sk_buff *skb; | 128 | struct sk_buff *skb; |
128 | struct net_device *dev; | 129 | struct net_device *dev; |
@@ -155,7 +156,6 @@ struct ieee80211_txrx_data { | |||
155 | int load; | 156 | int load; |
156 | u32 tkip_iv32; | 157 | u32 tkip_iv32; |
157 | u16 tkip_iv16; | 158 | u16 tkip_iv16; |
158 | u8 amsdu_frame; | ||
159 | } rx; | 159 | } rx; |
160 | } u; | 160 | } u; |
161 | }; | 161 | }; |