diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-09-24 15:52:34 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-09-24 15:52:34 -0400 |
| commit | 29ad2facd47f8e37eab8b156e2c384fa181c8b4a (patch) | |
| tree | 25d4df186cd631810ff15a8e7d37cb6cdd806cdb /net/mac80211/rx.c | |
| parent | 6e5c2b4e8addfaab8ef54dedaf7b607e1585c35b (diff) | |
| parent | cd87a2d3a33d75a646f1aa1aa2ee5bf712d6f963 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/base.c
net/mac80211/main.c
Diffstat (limited to 'net/mac80211/rx.c')
| -rw-r--r-- | net/mac80211/rx.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c index c0368152b72..308e502a80e 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2286,9 +2286,6 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, struct net_device *prev_dev = NULL; struct ieee80211_rx_status *status = IEEE80211_SKB_RXCB(skb); - if (status->flag & RX_FLAG_INTERNAL_CMTR) - goto out_free_skb; - if (skb_headroom(skb) < sizeof(*rthdr) && pskb_expand_head(skb, sizeof(*rthdr), 0, GFP_ATOMIC)) goto out_free_skb; @@ -2347,7 +2344,6 @@ static void ieee80211_rx_cooked_monitor(struct ieee80211_rx_data *rx, } else goto out_free_skb; - status->flag |= RX_FLAG_INTERNAL_CMTR; return; out_free_skb: |