mac80211: Remove superfluous if clause (0c2530ce) · Commits · 戴 / test

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>

net/mac80211/rx.c

+1 −11

Original line number	Diff line number	Diff line
		@@ -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. */
		(!rx->sta \|\| !test_sta_flags(rx->sta, WLAN_STA_ASSOC))))
		return RX_DROP_MONITOR;
		}

		return RX_DROP_MONITOR;
		}

		return RX_CONTINUE;
		}

Admin message