提交 076cdcb1 编写于 作者: J Johannes Berg

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: NJohannes Berg <johannes.berg@intel.com>
上级 90d13e8f
...@@ -1850,7 +1850,7 @@ void ieee80211_dynamic_ps_disable_work(struct work_struct *work); ...@@ -1850,7 +1850,7 @@ void ieee80211_dynamic_ps_disable_work(struct work_struct *work);
void ieee80211_dynamic_ps_timer(unsigned long data); void ieee80211_dynamic_ps_timer(unsigned long data);
void ieee80211_send_nullfunc(struct ieee80211_local *local, void ieee80211_send_nullfunc(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata, struct ieee80211_sub_if_data *sdata,
int powersave); bool powersave);
void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata, void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
struct ieee80211_hdr *hdr); struct ieee80211_hdr *hdr);
void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata, void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata,
......
...@@ -936,7 +936,7 @@ void ieee80211_send_pspoll(struct ieee80211_local *local, ...@@ -936,7 +936,7 @@ void ieee80211_send_pspoll(struct ieee80211_local *local,
void ieee80211_send_nullfunc(struct ieee80211_local *local, void ieee80211_send_nullfunc(struct ieee80211_local *local,
struct ieee80211_sub_if_data *sdata, struct ieee80211_sub_if_data *sdata,
int powersave) bool powersave)
{ {
struct sk_buff *skb; struct sk_buff *skb;
struct ieee80211_hdr_3addr *nullfunc; struct ieee80211_hdr_3addr *nullfunc;
...@@ -1420,7 +1420,7 @@ static void ieee80211_enable_ps(struct ieee80211_local *local, ...@@ -1420,7 +1420,7 @@ static void ieee80211_enable_ps(struct ieee80211_local *local,
msecs_to_jiffies(conf->dynamic_ps_timeout)); msecs_to_jiffies(conf->dynamic_ps_timeout));
} else { } else {
if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK)) 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) && if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK) &&
ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS))
...@@ -1635,7 +1635,7 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) ...@@ -1635,7 +1635,7 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work)
msecs_to_jiffies( msecs_to_jiffies(
local->hw.conf.dynamic_ps_timeout)); local->hw.conf.dynamic_ps_timeout));
} else { } else {
ieee80211_send_nullfunc(local, sdata, 1); ieee80211_send_nullfunc(local, sdata, true);
/* Flush to get the tx status of nullfunc frame */ /* Flush to get the tx status of nullfunc frame */
ieee80211_flush_queues(local, sdata, false); ieee80211_flush_queues(local, sdata, false);
} }
...@@ -2268,7 +2268,7 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata) ...@@ -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)) { if (ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) {
ifmgd->nullfunc_failed = false; ifmgd->nullfunc_failed = false;
ieee80211_send_nullfunc(sdata->local, sdata, 0); ieee80211_send_nullfunc(sdata->local, sdata, false);
} else { } else {
int ssid_len; int ssid_len;
...@@ -3445,7 +3445,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, ...@@ -3445,7 +3445,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata,
ieee80211_hw_config(local, ieee80211_hw_config(local,
IEEE80211_CONF_CHANGE_PS); IEEE80211_CONF_CHANGE_PS);
} }
ieee80211_send_nullfunc(local, sdata, 0); ieee80211_send_nullfunc(local, sdata, false);
} else if (!local->pspolling && sdata->u.mgd.powersave) { } else if (!local->pspolling && sdata->u.mgd.powersave) {
local->pspolling = true; local->pspolling = true;
......
...@@ -57,7 +57,7 @@ static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata) ...@@ -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 * to send a new nullfunc frame to inform the AP that we
* are again sleeping. * 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 */ /* 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) ...@@ -66,7 +66,7 @@ static void ieee80211_offchannel_ps_disable(struct ieee80211_sub_if_data *sdata)
struct ieee80211_local *local = sdata->local; struct ieee80211_local *local = sdata->local;
if (!local->ps_sdata) if (!local->ps_sdata)
ieee80211_send_nullfunc(local, sdata, 0); ieee80211_send_nullfunc(local, sdata, false);
else if (local->offchannel_ps_enabled) { else if (local->offchannel_ps_enabled) {
/* /*
* In !IEEE80211_HW_PS_NULLFUNC_STACK case the hardware * 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) ...@@ -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 * restart the timer now and send a nullfunc frame to inform
* the AP that we are awake. * 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 + mod_timer(&local->dynamic_ps_timer, jiffies +
msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout));
} }
......
...@@ -1966,7 +1966,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) ...@@ -1966,7 +1966,7 @@ int ieee80211_reconfig(struct ieee80211_local *local)
if (!sdata->u.mgd.associated) if (!sdata->u.mgd.associated)
continue; continue;
ieee80211_send_nullfunc(local, sdata, 0); ieee80211_send_nullfunc(local, sdata, false);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册