diff options
author | Johannes Berg <johannes.berg@intel.com> | 2015-09-24 10:14:55 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2015-09-29 09:56:52 -0400 |
commit | 076cdcb12f784b2057f172b5caca641fafa67cdf (patch) | |
tree | 8b1621ae082ebb3c0a2def9c359997f0e77818a5 /net/mac80211 | |
parent | 90d13e8f5b3c2445f481be4a2012a1861337f718 (diff) |
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: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/ieee80211_i.h | 2 | ||||
-rw-r--r-- | net/mac80211/mlme.c | 10 | ||||
-rw-r--r-- | net/mac80211/offchannel.c | 6 | ||||
-rw-r--r-- | net/mac80211/util.c | 2 |
4 files changed, 10 insertions, 10 deletions
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index 1af655a136bb..f9605f13def9 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h | |||
@@ -1850,7 +1850,7 @@ void ieee80211_dynamic_ps_disable_work(struct work_struct *work); | |||
1850 | void ieee80211_dynamic_ps_timer(unsigned long data); | 1850 | void ieee80211_dynamic_ps_timer(unsigned long data); |
1851 | void ieee80211_send_nullfunc(struct ieee80211_local *local, | 1851 | void ieee80211_send_nullfunc(struct ieee80211_local *local, |
1852 | struct ieee80211_sub_if_data *sdata, | 1852 | struct ieee80211_sub_if_data *sdata, |
1853 | int powersave); | 1853 | bool powersave); |
1854 | void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata, | 1854 | void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata, |
1855 | struct ieee80211_hdr *hdr); | 1855 | struct ieee80211_hdr *hdr); |
1856 | void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata, | 1856 | void ieee80211_sta_tx_notify(struct ieee80211_sub_if_data *sdata, |
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 88894d9a25b2..88047bf6c0e0 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -936,7 +936,7 @@ void ieee80211_send_pspoll(struct ieee80211_local *local, | |||
936 | 936 | ||
937 | void ieee80211_send_nullfunc(struct ieee80211_local *local, | 937 | void ieee80211_send_nullfunc(struct ieee80211_local *local, |
938 | struct ieee80211_sub_if_data *sdata, | 938 | struct ieee80211_sub_if_data *sdata, |
939 | int powersave) | 939 | bool powersave) |
940 | { | 940 | { |
941 | struct sk_buff *skb; | 941 | struct sk_buff *skb; |
942 | struct ieee80211_hdr_3addr *nullfunc; | 942 | struct ieee80211_hdr_3addr *nullfunc; |
@@ -1420,7 +1420,7 @@ static void ieee80211_enable_ps(struct ieee80211_local *local, | |||
1420 | msecs_to_jiffies(conf->dynamic_ps_timeout)); | 1420 | msecs_to_jiffies(conf->dynamic_ps_timeout)); |
1421 | } else { | 1421 | } else { |
1422 | if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK)) | 1422 | if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK)) |
1423 | ieee80211_send_nullfunc(local, sdata, 1); | 1423 | ieee80211_send_nullfunc(local, sdata, true); |
1424 | 1424 | ||
1425 | if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK) && | 1425 | if (ieee80211_hw_check(&local->hw, PS_NULLFUNC_STACK) && |
1426 | ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) | 1426 | ieee80211_hw_check(&local->hw, REPORTS_TX_ACK_STATUS)) |
@@ -1635,7 +1635,7 @@ void ieee80211_dynamic_ps_enable_work(struct work_struct *work) | |||
1635 | msecs_to_jiffies( | 1635 | msecs_to_jiffies( |
1636 | local->hw.conf.dynamic_ps_timeout)); | 1636 | local->hw.conf.dynamic_ps_timeout)); |
1637 | } else { | 1637 | } else { |
1638 | ieee80211_send_nullfunc(local, sdata, 1); | 1638 | ieee80211_send_nullfunc(local, sdata, true); |
1639 | /* Flush to get the tx status of nullfunc frame */ | 1639 | /* Flush to get the tx status of nullfunc frame */ |
1640 | ieee80211_flush_queues(local, sdata, false); | 1640 | ieee80211_flush_queues(local, sdata, false); |
1641 | } | 1641 | } |
@@ -2268,7 +2268,7 @@ static void ieee80211_mgd_probe_ap_send(struct ieee80211_sub_if_data *sdata) | |||
2268 | 2268 | ||
2269 | if (ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) { | 2269 | if (ieee80211_hw_check(&sdata->local->hw, REPORTS_TX_ACK_STATUS)) { |
2270 | ifmgd->nullfunc_failed = false; | 2270 | ifmgd->nullfunc_failed = false; |
2271 | ieee80211_send_nullfunc(sdata->local, sdata, 0); | 2271 | ieee80211_send_nullfunc(sdata->local, sdata, false); |
2272 | } else { | 2272 | } else { |
2273 | int ssid_len; | 2273 | int ssid_len; |
2274 | 2274 | ||
@@ -3445,7 +3445,7 @@ static void ieee80211_rx_mgmt_beacon(struct ieee80211_sub_if_data *sdata, | |||
3445 | ieee80211_hw_config(local, | 3445 | ieee80211_hw_config(local, |
3446 | IEEE80211_CONF_CHANGE_PS); | 3446 | IEEE80211_CONF_CHANGE_PS); |
3447 | } | 3447 | } |
3448 | ieee80211_send_nullfunc(local, sdata, 0); | 3448 | ieee80211_send_nullfunc(local, sdata, false); |
3449 | } else if (!local->pspolling && sdata->u.mgd.powersave) { | 3449 | } else if (!local->pspolling && sdata->u.mgd.powersave) { |
3450 | local->pspolling = true; | 3450 | local->pspolling = true; |
3451 | 3451 | ||
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index f2c75cf491fc..04401037140e 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c | |||
@@ -57,7 +57,7 @@ static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata) | |||
57 | * to send a new nullfunc frame to inform the AP that we | 57 | * to send a new nullfunc frame to inform the AP that we |
58 | * are again sleeping. | 58 | * are again sleeping. |
59 | */ | 59 | */ |
60 | ieee80211_send_nullfunc(local, sdata, 1); | 60 | ieee80211_send_nullfunc(local, sdata, true); |
61 | } | 61 | } |
62 | 62 | ||
63 | /* inform AP that we are awake again, unless power save is enabled */ | 63 | /* 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 | struct ieee80211_local *local = sdata->local; | 66 | struct ieee80211_local *local = sdata->local; |
67 | 67 | ||
68 | if (!local->ps_sdata) | 68 | if (!local->ps_sdata) |
69 | ieee80211_send_nullfunc(local, sdata, 0); | 69 | ieee80211_send_nullfunc(local, sdata, false); |
70 | else if (local->offchannel_ps_enabled) { | 70 | else if (local->offchannel_ps_enabled) { |
71 | /* | 71 | /* |
72 | * In !IEEE80211_HW_PS_NULLFUNC_STACK case the hardware | 72 | * 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 | * restart the timer now and send a nullfunc frame to inform | 93 | * restart the timer now and send a nullfunc frame to inform |
94 | * the AP that we are awake. | 94 | * the AP that we are awake. |
95 | */ | 95 | */ |
96 | ieee80211_send_nullfunc(local, sdata, 0); | 96 | ieee80211_send_nullfunc(local, sdata, false); |
97 | mod_timer(&local->dynamic_ps_timer, jiffies + | 97 | mod_timer(&local->dynamic_ps_timer, jiffies + |
98 | msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); | 98 | msecs_to_jiffies(local->hw.conf.dynamic_ps_timeout)); |
99 | } | 99 | } |
diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 62948bbb0623..60c4dbf92625 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c | |||
@@ -1966,7 +1966,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) | |||
1966 | if (!sdata->u.mgd.associated) | 1966 | if (!sdata->u.mgd.associated) |
1967 | continue; | 1967 | continue; |
1968 | 1968 | ||
1969 | ieee80211_send_nullfunc(local, sdata, 0); | 1969 | ieee80211_send_nullfunc(local, sdata, false); |
1970 | } | 1970 | } |
1971 | } | 1971 | } |
1972 | 1972 | ||