aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
Diffstat (limited to 'net')
-rw-r--r--net/mac80211/rx.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index db343fa8033..e4ee3274899 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -378,9 +378,6 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb,
378 * the SKB because it has a bad FCS/PLCP checksum. 378 * the SKB because it has a bad FCS/PLCP checksum.
379 */ 379 */
380 380
381 /* room for the radiotap header based on driver features */
382 needed_headroom = ieee80211_rx_radiotap_space(local, status);
383
384 if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS) 381 if (local->hw.flags & IEEE80211_HW_RX_INCLUDES_FCS)
385 present_fcs_len = FCS_LEN; 382 present_fcs_len = FCS_LEN;
386 383
@@ -399,6 +396,9 @@ ieee80211_rx_monitor(struct ieee80211_local *local, struct sk_buff *origskb,
399 return remove_monitor_info(local, origskb); 396 return remove_monitor_info(local, origskb);
400 } 397 }
401 398
399 /* room for the radiotap header based on driver features */
400 needed_headroom = ieee80211_rx_radiotap_space(local, status);
401
402 if (should_drop_frame(origskb, present_fcs_len)) { 402 if (should_drop_frame(origskb, present_fcs_len)) {
403 /* only need to expand headroom if necessary */ 403 /* only need to expand headroom if necessary */
404 skb = origskb; 404 skb = origskb;