diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-30 12:02:22 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-30 12:02:22 -0700 |
| commit | 92629195314d8adefabeb78b13d681ad1c01e778 (patch) | |
| tree | cc84705305a643b391965e4136d07509234ff0e5 /net | |
| parent | a91e7d471e2e384035b9746ea707ccdcd353f5dd (diff) | |
| parent | e7ee762cf074b0fd8eec483d0cef8fdbf0d04b81 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Diffstat (limited to 'net')
| -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 fa0f37e4afe4..28624282c5f3 100644 --- a/net/mac80211/rx.c +++ b/net/mac80211/rx.c @@ -2199,9 +2199,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; @@ -2260,7 +2257,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: |