diff options
| author | Rajkumar Manoharan <rmanohar@qca.qualcomm.com> | 2012-06-18 09:33:52 -0400 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-06-20 04:53:34 -0400 |
| commit | 559cef996d2e4c9b652a53bb3a53e5787e247f57 (patch) | |
| tree | 0b445a9cd37ab5404eddbfeb2579e183f8318d1e | |
| parent | 7ebfa46973aa239f79fbd4651ddeed5c92df45b2 (diff) | |
mac80211: cleanup offchannel_ps_enable argument
The 'tell_ap' argument is always true. So that remove it
and simplify the function.
Signed-off-by: Rajkumar Manoharan <rmanohar@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
| -rw-r--r-- | net/mac80211/offchannel.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/mac80211/offchannel.c b/net/mac80211/offchannel.c index fcb01ee8ee7b..febce7fb7bb1 100644 --- a/net/mac80211/offchannel.c +++ b/net/mac80211/offchannel.c | |||
| @@ -25,8 +25,7 @@ | |||
| 25 | * because we *may* be doing work on-operating channel, and want our | 25 | * because we *may* be doing work on-operating channel, and want our |
| 26 | * hardware unconditionally awake, but still let the AP send us normal frames. | 26 | * hardware unconditionally awake, but still let the AP send us normal frames. |
| 27 | */ | 27 | */ |
| 28 | static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata, | 28 | static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata) |
| 29 | bool tell_ap) | ||
| 30 | { | 29 | { |
| 31 | struct ieee80211_local *local = sdata->local; | 30 | struct ieee80211_local *local = sdata->local; |
| 32 | struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; | 31 | struct ieee80211_if_managed *ifmgd = &sdata->u.mgd; |
| @@ -47,8 +46,8 @@ static void ieee80211_offchannel_ps_enable(struct ieee80211_sub_if_data *sdata, | |||
| 47 | ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); | 46 | ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_PS); |
| 48 | } | 47 | } |
| 49 | 48 | ||
| 50 | if (tell_ap && (!local->offchannel_ps_enabled || | 49 | if (!local->offchannel_ps_enabled || |
| 51 | !(local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK))) | 50 | !(local->hw.flags & IEEE80211_HW_PS_NULLFUNC_STACK)) |
| 52 | /* | 51 | /* |
| 53 | * If power save was enabled, no need to send a nullfunc | 52 | * If power save was enabled, no need to send a nullfunc |
| 54 | * frame because AP knows that we are sleeping. But if the | 53 | * frame because AP knows that we are sleeping. But if the |
| @@ -133,7 +132,7 @@ void ieee80211_offchannel_stop_vifs(struct ieee80211_local *local, | |||
| 133 | if (offchannel_ps_enable && | 132 | if (offchannel_ps_enable && |
| 134 | (sdata->vif.type == NL80211_IFTYPE_STATION) && | 133 | (sdata->vif.type == NL80211_IFTYPE_STATION) && |
| 135 | sdata->u.mgd.associated) | 134 | sdata->u.mgd.associated) |
| 136 | ieee80211_offchannel_ps_enable(sdata, true); | 135 | ieee80211_offchannel_ps_enable(sdata); |
| 137 | } | 136 | } |
| 138 | } | 137 | } |
| 139 | mutex_unlock(&local->iflist_mtx); | 138 | mutex_unlock(&local->iflist_mtx); |
