svn commit: r305745 - head/sys/dev/urtwn

[Adrian Chadd]

Ah, ugh, that thing.. :(


-adrian

On 12 September 2016 at 11:40, Andriy Voskoboinyk <avos at freebsd.org> wrote:
> Mon, 12 Sep 2016 21:10:54 +0300 було написано Adrian Chadd
> <adrian.chadd at gmail.com>:
>
> Hi,
>
> The error handling is splitted between ieee80211_raw_output() and
> ic_raw_xmit();
> it cannot be moved completely to net80211 because of
> https://lists.freebsd.org/pipermail/freebsd-wireless/2015-November/006272.html
>
>
>> Hi,
>>
>> That's why I created ieee80211_tx_complete(). Is that not "right" here?
>>
>>
>>
>> -a
>>
>>
>> On 12 September 2016 at 09:46, Andriy Voskoboinyk <avos at freebsd.org>
>> wrote:
>>>
>>> Author: avos
>>> Date: Mon Sep 12 16:46:14 2016
>>> New Revision: 305745
>>> URL: https://svnweb.freebsd.org/changeset/base/305745
>>>
>>> Log:
>>>   urtwn: fix possible driver hang when beacon miss is detected.
>>>
>>> Modified:
>>>   head/sys/dev/urtwn/if_urtwn.c
>>>
>>> Modified: head/sys/dev/urtwn/if_urtwn.c
>>>
>>> ==============================================================================
>>> --- head/sys/dev/urtwn/if_urtwn.c       Mon Sep 12 16:44:21 2016
>>> (r305744)
>>> +++ head/sys/dev/urtwn/if_urtwn.c       Mon Sep 12 16:46:14 2016
>>> (r305745)
>>> @@ -5628,8 +5628,11 @@ urtwn_raw_xmit(struct ieee80211_node *ni
>>>         callout_reset(&sc->sc_watchdog_ch, hz, urtwn_watchdog, sc);
>>>
>>>  end:
>>> -       if (error != 0)
>>> +       if (error != 0) {
>>> +               if (m->m_flags & M_TXCB)
>>> +                       ieee80211_process_callback(ni, m, 1);
>>>                 m_freem(m);
>>> +       }
>>>
>>>         URTWN_UNLOCK(sc);
>>>
>