Commit 076cdcb1 authored by Johannes Berg's avatar Johannes Berg
Browse files

mac80211: use bool argument to ieee80211_send_nullfunc 



Instead of int with 0/1, use bool with false/true for the
powersave argument to ieee80211_send_nullfunc().

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

net/mac80211/ieee80211_i.h

+1 −1
Original line number Diff line number Diff line
@@ -1850,7 +1850,7 @@ void ieee80211_dynamic_ps_disable_work(struct work_struct *work); 
void ieee80211_dynamic_ps_timer(unsigned long data);

void ieee80211_send_nullfunc(struct ieee80211_local *local,

			     struct ieee80211_sub_if_data *sdata,

			     int powersave);

			     bool powersave);

void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,

			     struct ieee80211_hdr *hdr);

void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,

net/mac80211/mlme.c

+5 −5
Original line number Diff line number Diff line
@@ -936,7 +936,7 @@ void ieee80211_send_pspoll(struct ieee80211_local *local, 


void ieee80211_send_nullfunc(struct ieee80211_local *local,

			     struct ieee80211_sub_if_data *sdata,

			     int powersave)

			     bool powersave)

{

	struct sk_buff *skb;

	struct ieee80211_hdr_3addr *nullfunc;
@@ -1420,7 +1420,7 @@ static void ieee80211_enable_ps(struct ieee80211_local *local, 
			  msecs_to_jiffies(conf->dynamic_ps_timeout));

	} else {

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

			ieee80211_send_nullfunc(local, sdata, 1);

			ieee80211_send_nullfunc(local, sdata, true);



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

		    ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS))
@@ -1635,7 +1635,7 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) 
				  msecs_to_jiffies(

				  local->hw.conf.dynamic_ps_timeout));

		} else {

			ieee80211_send_nullfunc(local, sdata, 1);

			ieee80211_send_nullfunc(local, sdata, true);

			/* Flush to get the tx status of nullfunc frame */

			ieee80211_flush_queues(local, sdata, false);

		}
@@ -2268,7 +2268,7 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata) 


	if (ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) {

		ifmgd->nullfunc_failed = false;

		ieee80211_send_nullfunc(sdata->local, sdata, 0);

		ieee80211_send_nullfunc(sdata->local, sdata, false);

	} else {

		int ssid_len;
@@ -3445,7 +3445,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, 
				ieee80211_hw_config(local,

						    IEEE80211_CONF_CHANGE_PS);

			}

			ieee80211_send_nullfunc(local, sdata, 0);

			ieee80211_send_nullfunc(local, sdata, false);

		} else if (!local->pspolling && sdata->u.mgd.powersave) {

			local->pspolling = true;

net/mac80211/offchannel.c

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata) 
		 * to send a new nullfunc frame to inform the AP that we

		 * are again sleeping.

		 */

		ieee80211_send_nullfunc(local, sdata, 1);

		ieee80211_send_nullfunc(local, sdata, true);

}



/* inform AP that we are awake again, unless power save is enabled */
@@ -66,7 +66,7 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata) 
	struct ieee80211_local *local = sdata->local;



	if (!local->ps_sdata)

		ieee80211_send_nullfunc(local, sdata, 0);

		ieee80211_send_nullfunc(local, sdata, false);

	else if (local->offchannel_ps_enabled) {

		/*

		 * In !IEEE80211_HW_PS_NULLFUNC_STACK case the hardware
@@ -93,7 +93,7 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata) 
		 * restart the timer now and send a nullfunc frame to inform

		 * the AP that we are awake.

		 */

		ieee80211_send_nullfunc(local, sdata, 0);

		ieee80211_send_nullfunc(local, sdata, false);

		mod_timer(&local->dynamic_ps_timer, jiffies +

			  msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));

	}

net/mac80211/util.c

+1 −1
Original line number Diff line number Diff line
@@ -1966,7 +1966,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) 
			if (!sdata->u.mgd.associated)

				continue;



			ieee80211_send_nullfunc(local, sdata, 0);

			ieee80211_send_nullfunc(local, sdata, false);

		}

	}