diff options
author | Johannes Berg <johannes@sipsolutions.net> | 2009-11-25 11:46:15 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-11-28 15:05:01 -0500 |
commit | 8c0c709eea5cbab97fb464cd68b06f24acc58ee1 (patch) | |
tree | 23af087965cd5f6142e951eccbee1817560e6506 /net/mac80211 | |
parent | e60d7443e00a72a2c056950cdaab79c7b077f3d4 (diff) |
mac80211: move cmntr flag out of rx flags
The RX flags should soon be used only for flags
that cannot change within an a-MPDU, so move the
cooked monitor flag into the RX status flags.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 3 | ||||
-rw-r--r-- | net/mac80211/rx.c | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 04093e84ebd7..ba5d3637b956 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -163,8 +163,7 @@ 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) | ||
168 | 167 | ||
169 | struct ieee80211_rx_data { | 168 | struct ieee80211_rx_data { |
170 | struct sk_buff *skb; | 169 | struct sk_buff *skb; |
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index 96f13ad05d3c..097bb0343b91 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c | |||
@@ -1868,7 +1868,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, | |||
1868 | struct net_device *prev_dev = NULL; | 1868 | struct net_device *prev_dev = NULL; |
1869 | struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); | 1869 | struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); |
1870 | 1870 | ||
1871 | if (rx->flags & IEEE80211_RX_CMNTR_REPORTED) | 1871 | if (status->flag & RX_FLAG_INTERNAL_CMTR) |
1872 | goto out_free_skb; | 1872 | goto out_free_skb; |
1873 | 1873 | ||
1874 | if (skb_headroom(skb) < sizeof(*rthdr) && | 1874 | if (skb_headroom(skb) < sizeof(*rthdr) && |
@@ -1929,7 +1929,7 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, | |||
1929 | } else | 1929 | } else |
1930 | goto out_free_skb; | 1930 | goto out_free_skb; |
1931 | 1931 | ||
1932 | rx->flags |= IEEE80211_RX_CMNTR_REPORTED; | 1932 | status->flag |= RX_FLAG_INTERNAL_CMTR; |
1933 | return; | 1933 | return; |
1934 | 1934 | ||
1935 | out_free_skb: | 1935 | out_free_skb: |