diff options
| author | Helmut Schaa <helmut.schaa@googlemail.com> | 2011-02-12 14:17:15 +0100 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-02-14 15:51:20 -0500 |
| commit | 0c2530cec5672f38f8ab834ee53d17175d3bca95 (patch) | |
| tree | 1c035db946d3114273c5f5b555d119dfc49899a4 /net/mac80211 | |
| parent | 014cf3bb1e19a61c53666d7f990f584f1b7af364 (diff) | |
| download | linux-stable-0c2530cec5672f38f8ab834ee53d17175d3bca95.tar.gz linux-stable-0c2530cec5672f38f8ab834ee53d17175d3bca95.tar.bz2 linux-stable-0c2530cec5672f38f8ab834ee53d17175d3bca95.zip | |
mac80211: Remove superfluous if clause
ieee80211_rx_h_check returned RX_DROP_MONITOR in case the if statement
in question was true but the same return value is also used directly
after the if clause. Hence, we can just drop the whole if clause and as
such simplify the code.
Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/rx.c | 12 |
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) 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; } |