diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-04 16:25:15 -0500 |
| commit | 8f56874bd7e8bee73ed6a1cf80dcec2753616262 (patch) | |
| tree | aebd15dea662ef5efd89402b8fd92fec540a98eb /net/mac80211/ieee80211_i.h | |
| parent | 47e1c323069bcef0acb8a2b48921688573f5ca63 (diff) | |
| parent | 159bcfeb9123c91f0dc885a42b6387a98192f896 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'net/mac80211/ieee80211_i.h')
| -rw-r--r-- | net/mac80211/ieee80211_i.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 039affa7c871..419f186cfcf0 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
| @@ -163,8 +163,8 @@ typedef unsigned __bitwise__ ieee80211_rx_result; | |||
| 163 | /* frame is destined to interface currently processed (incl. multicast frames) */ | 163 | /* frame is destined to interface currently processed (incl. multicast frames) */ |
| 164 | #define IEEE80211_RX_RA_MATCH BIT(1) | 164 | #define IEEE80211_RX_RA_MATCH BIT(1) |
| 165 | #define IEEE80211_RX_AMSDU BIT(2) | 165 | #define IEEE80211_RX_AMSDU BIT(2) |
| 166 | #define IEEE80211_RX_CMNTR_REPORTED BIT(3) | 166 | #define IEEE80211_RX_FRAGMENTED BIT(3) |
| 167 | #define IEEE80211_RX_FRAGMENTED BIT(4) | 167 | /* only add flags here that do not change with subframes of an aMPDU */ |
| 168 | 168 | ||
| 169 | struct ieee80211_rx_data { | 169 | struct ieee80211_rx_data { |
| 170 | struct sk_buff *skb; | 170 | struct sk_buff *skb; |