Re: [RFC PATCH 1/3] mac80211: restructure disassoc/deauth flows

Tomas Winkler
2008-09-08T08:55:42Z

On Mon, Sep 8, 2008 at 11:23 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> On Sun, 2008-09-07 at 01:14 +0300, Tomas Winkler wrote:
>
>> @@ -1104,16 +1133,12 @@ static void ieee80211_associated(struct ieee80211_sub_if_data *sdata,
>>
>> rcu_read_unlock();
>>
>> - if (disassoc && sta)
>> - sta_info_destroy(sta);
>> -
>> - if (disassoc) {
>> - ifsta->state = IEEE80211_STA_MLME_DISABLED;
>> - ieee80211_set_associated(sdata, ifsta, 0);
>> - } else {
>> + if (disassoc)
>> + ieee80211_set_disassoc(sdata, ifsta, 1, 1,
>> + WLAN_REASON_PREV_AUTH_NOT_VALID);
>> + else
>> mod_timer(&ifsta->timer, jiffies +
>> IEEE80211_MONITORING_INTERVAL);
>> - }
>> }
>>
>>
>
> This hunk has another bug, or rather, we need to add this hunk:
>
> @@ -1084,7 +1114,6 @@ static void ieee80211_associated(struct
> "range\n",
> sdata->dev->name, print_mac(mac, ifsta->bssid));
> disassoc = 1;
> - sta_info_unlink(&sta);
> } else
> ieee80211_send_probe_req(sdata, ifsta->bssid,
> local->scan_ssid,
>
Yep
This is rebasing bug. This line is newer than the original patch.
I will added this hunk.
Thanks