On Tue, Dec 7, 2010 at 1:38 AM, Johannes Berg <johannes@xxxxxxxxxxxxxxxx> wrote:
> On Mon, 2010-12-06 at 18:48 -0800, Luis R. Rodriguez wrote:
>> There are a few places where mac80211 may issue a hw config
>> but the hw config will be ignored and got into a black hole if
>> the device count is already 0. Further hw config calls will also
>> be discarded as the device is already marked as idle, in these
>> cases mac80211 assumes the radio is idle but the driver never
>> really got the notification. We need to ensure that places that
>> will call a hw reconfig with open_count set to 0 will send the
>> notification to the driver. This forces these checks in a few
>> other key missing places.
>>
>> Without this suspend and resume is broken on devices which require
>> notifying the driver to become idle once the open_count already
>> has reached 0. This fixes suspend/resume when using new DBus APIs
>> are used which idle the device in places which had not yet gotten
>> widely tested.
>>
>> Cc: stable@xxxxxxxxxx
>> Cc: Paul Stewart <pstew@xxxxxxxxxx>
>> Cc: Amod Bodas <amod.bodas@xxxxxxxxxxx>
>> Cc: Johannes Berg <johannes.berg@xxxxxxxxx>
>> Signed-off-by: Luis R. Rodriguez <lrodriguez@xxxxxxxxxxx>
>> ---
>> Ânet/mac80211/ieee80211_i.h | Â Â1 +
>> Ânet/mac80211/iface.c    |  16 ++++++++++++++--
>> Ânet/mac80211/pm.c     Â|  Â2 ++
>> Ânet/mac80211/scan.c    Â|  Â2 +-
>> Ânet/mac80211/util.c    Â|  Â1 +
>> Â5 files changed, 19 insertions(+), 3 deletions(-)
>>
>> diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
>> index ae32349..78ab6ff 100644
>> --- a/net/mac80211/ieee80211_i.h
>> +++ b/net/mac80211/ieee80211_i.h
>> @@ -1211,6 +1211,7 @@ void ieee80211_process_measurement_req(struct ieee80211_sub_if_data *sdata,
>>
>> Â/* Suspend/resume and hw reconfiguration */
>> Âint ieee80211_reconfig(struct ieee80211_local *local);
>> +void ieee80211_recalc_idle_force(struct ieee80211_local *local);
>> Âvoid ieee80211_stop_device(struct ieee80211_local *local);
>>
>> Â#ifdef CONFIG_PM
>> diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
>> index 36b7000..a590bae 100644
>> --- a/net/mac80211/iface.c
>> +++ b/net/mac80211/iface.c
>> @@ -1320,7 +1320,8 @@ u32 __ieee80211_recalc_idle(struct ieee80211_local *local)
>> Â Â Â return 0;
>> Â}
>>
>> -void ieee80211_recalc_idle(struct ieee80211_local *local)
>> +static void ieee80211_recalc_idle_check(struct ieee80211_local *local,
>> + Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â bool force)
>> Â{
>> Â Â Â u32 chg;
>>
>> @@ -1328,7 +1329,18 @@ void ieee80211_recalc_idle(struct ieee80211_local *local)
>> Â Â Â chg = __ieee80211_recalc_idle(local);
>> Â Â Â mutex_unlock(&local->iflist_mtx);
>> Â Â Â if (chg)
>> - Â Â Â Â Â Â ieee80211_hw_config(local, chg);
>> + Â Â Â Â Â Â __ieee80211_hw_config(local, chg, force);
>> +}
>> +
>> +void ieee80211_recalc_idle(struct ieee80211_local *local)
>> +{
>> + Â Â ieee80211_recalc_idle_check(local, false);
>> +}
>
> I think I'd probably prefer an inline too.
OK
>> --- a/net/mac80211/pm.c
>> +++ b/net/mac80211/pm.c
>> @@ -98,6 +98,8 @@ int __ieee80211_suspend(struct ieee80211_hw *hw)
>> Â Â Â if (local->open_count)
>> Â Â Â Â Â Â Â ieee80211_stop_device(local);
>>
>> + Â Â ieee80211_recalc_idle_force(local);
>
> Err? You just added a call to stop_device() too,
What if open_count is 0?
> and at the wrong place as well...
I'll fix thanks.
>> @@ -1121,6 +1121,7 @@ void ieee80211_stop_device(struct ieee80211_local *local)
>>
>> Â Â Â flush_workqueue(local->workqueue);
>> Â Â Â drv_stop(local);
>> + Â Â ieee80211_recalc_idle_force(local);
>
> That one definitely can't be after drv_stop().
OK why though?
Luis
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
