Commit 90d13e8f authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: reduce indentation by inlining a check 



Instead of nesting two if statements, inline the second
check into the first if statement and to indentation.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 50f36ae6

net/mac80211/mlme.c

+20 −24
Original line number Diff line number Diff line
@@ -3437,11 +3437,8 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
					  len - baselen, false, &elems,

					  care_about_ies, ncrc);



	if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK)) {

		bool directed_tim = ieee80211_check_tim(elems.tim,

							elems.tim_len,

							ifmgd->aid);

		if (directed_tim) {

	if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK) &&

	    ieee80211_check_tim(elems.tim, elems.tim_len, ifmgd->aid)) {

		if (local->hw.conf.dynamic_ps_timeout > 0) {

			if (local->hw.conf.flags & IEEE80211_CONF_PS) {

				local->hw.conf.flags &= ~IEEE80211_CONF_PS;
@@ -3463,7 +3460,6 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
			ieee80211_send_pspoll(local, sdata);

		}

	}

	}



	if (sdata->vif.p2p) {

		struct ieee80211_p2p_noa_attr noa = {};