aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/rx.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/mac80211/rx.c')
-rw-r--r--net/mac80211/rx.c12
1 files changed, 1 insertions, 11 deletions
diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 045b2fe4a414..f502634d43af 100644
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -832,18 +832,8 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx)
832 ieee80211_is_pspoll(hdr->frame_control)) && 832 ieee80211_is_pspoll(hdr->frame_control)) &&
833 rx->sdata->vif.type != NL80211_IFTYPE_ADHOC && 833 rx->sdata->vif.type != NL80211_IFTYPE_ADHOC &&
834 rx->sdata->vif.type != NL80211_IFTYPE_WDS && 834 rx->sdata->vif.type != NL80211_IFTYPE_WDS &&
835 (!rx->sta || !test_sta_flags(rx->sta, WLAN_STA_ASSOC)))) { 835 (!rx->sta || !test_sta_flags(rx->sta, WLAN_STA_ASSOC))))
836 if ((!ieee80211_has_fromds(hdr->frame_control) &&
837 !ieee80211_has_tods(hdr->frame_control) &&
838 ieee80211_is_data(hdr->frame_control)) ||
839 !(status->rx_flags & IEEE80211_RX_RA_MATCH)) {
840 /* Drop IBSS frames and frames for other hosts
841 * silently. */
842 return RX_DROP_MONITOR;
843 }
844
845 return RX_DROP_MONITOR; 836 return RX_DROP_MONITOR;
846 }
847 837
848 return RX_CONTINUE; 838 return RX_CONTINUE;
849} 839}