| Message ID | 005001cfa5bc$f6befc60$e43cf520$@acksys.fr (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
In your line-wrapped reply there are 11/14 lines. In my original mail,
I'm counting 12/15 ;) The difference is the '{' part.
I will submit this change as a proper patch now, thanks for testing.
- Felix
On 2014-07-22 16:55, Jean-Pierre Tosoni wrote:
> Great, it works! No more oops, and my debug printk never appears anymore.
>
> But it looks like one line is missing in your patch, 12/15 lines announced
> but only 11/14 lines present?
>
> Thanks you so much!
>
> -----Message d'origine-----
> De : Felix Fietkau [mailto:nbd@openwrt.org]
> Envoyé : mardi 22 juillet 2014 15:47
> À : Jean-Pierre Tosoni; linux-wireless@vger.kernel.org
> Objet : Re: get_expected_throughput introduces a kernel oops on
> sta_set_sinfo calls
>
> On 2014-07-22 11:11, Jean-Pierre Tosoni wrote:
>> Hi list,
>>
>> I am using compat-wireless-20132-04-16 with kernel 3.3.8.
>> I experienced a kernel oops after applying the "get_expected_throughput"
>> patches series from Antonio Quartulli.
>> It happens when a station_dump is issued from userspace while an
>> association has begun but does not complete immediately due to bad
> channel.
>> After some debugging I made this patch which solves the issue:
> Please try this patch:
> ---
> --- a/net/mac80211/cfg.c
> +++ b/net/mac80211/cfg.c
> @@ -472,12 +472,15 @@ static void sta_set_sinfo(struct sta_info *sta, struct
> station_info *sinfo) {
> struct ieee80211_sub_if_data *sdata = sta->sdata;
> struct ieee80211_local *local = sdata->local;
> - struct rate_control_ref *ref = local->rate_ctrl;
> + struct rate_control_ref *ref = NULL;
> struct timespec uptime;
> u64 packets = 0;
> u32 thr = 0;
> int i, ac;
>
> + if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL))
> + ref = local->rate_ctrl;
> +
> sinfo->generation = sdata->local->sta_generation;
>
> sinfo->filled = STATION_INFO_INACTIVE_TIME |
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -472,12 +472,15 @@ static void sta_set_sinfo(struct sta_info *sta, struct station_info *sinfo) { struct ieee80211_sub_if_data *sdata = sta->sdata; struct ieee80211_local *local = sdata->local; - struct rate_control_ref *ref = local->rate_ctrl; + struct rate_control_ref *ref = NULL; struct timespec uptime; u64 packets = 0; u32 thr = 0; int i, ac; + if (test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) + ref = local->rate_ctrl; + sinfo->generation = sdata->local->sta_generation; sinfo->filled = STATION_INFO_INACTIVE_TIME |