From b0f14d4c1dcec7a05651cbc8c48a3b30365f2828 Mon Sep 17 00:00:00 2001 From: Helmut Schaa Date: Sat, 12 Feb 2011 14:17:15 +0100 Subject: [PATCH] --- yaml --- r: 237374 b: refs/heads/master c: 0c2530cec5672f38f8ab834ee53d17175d3bca95 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/net/mac80211/rx.c | 12 +----------- 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 7372385d58b1..764d17e8feb9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 014cf3bb1e19a61c53666d7f990f584f1b7af364 +refs/heads/master: 0c2530cec5672f38f8ab834ee53d17175d3bca95 diff --git a/trunk/net/mac80211/rx.c b/trunk/net/mac80211/rx.c index 045b2fe4a414..f502634d43af 100644 --- a/trunk/net/mac80211/rx.c +++ b/trunk/net/mac80211/rx.c @@ -832,18 +832,8 @@ ieee80211_rx_h_check(struct ieee80211_rx_data *rx) ieee80211_is_pspoll(hdr->frame_control)) && rx->sdata->vif.type != NL80211_IFTYPE_ADHOC && rx->sdata->vif.type != NL80211_IFTYPE_WDS && - (!rx->sta || !test_sta_flags(rx->sta, WLAN_STA_ASSOC)))) { - if ((!ieee80211_has_fromds(hdr->frame_control) && - !ieee80211_has_tods(hdr->frame_control) && - ieee80211_is_data(hdr->frame_control)) || - !(status->rx_flags & IEEE80211_RX_RA_MATCH)) { - /* Drop IBSS frames and frames for other hosts - * silently. */ - return RX_DROP_MONITOR; - } - + (!rx->sta || !test_sta_flags(rx->sta, WLAN_STA_ASSOC)))) return RX_DROP_MONITOR; - } return RX_CONTINUE; }