Date: Mon, 12 Sep 2016 13:35:55 -0700 From: Adrian Chadd <adrian.chadd@gmail.com> To: Andriy Voskoboinyk <avos@freebsd.org> Cc: "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@freebsd.org" <svn-src-head@freebsd.org> Subject: Re: svn commit: r305745 - head/sys/dev/urtwn Message-ID: <CAJ-Vmo=7XaRWb0O8B9MLXMgdPDwgBiRFONggJN3vKdvv=XVTgg@mail.gmail.com> In-Reply-To: <op.ynowugkf4dikkl@localhost> References: <201609121646.u8CGkEck004615@repo.freebsd.org> <CAJ-VmokmCyQ3w5H78Jo2DUu_FWgmN%2BuUovH%2BQh92%2B0=vRVKBCg@mail.gmail.com> <op.ynowugkf4dikkl@localhost>
next in thread | previous in thread | raw e-mail | index | archive | help
Ah, ugh, that thing.. :( -adrian On 12 September 2016 at 11:40, Andriy Voskoboinyk <avos@freebsd.org> wrote: > Mon, 12 Sep 2016 21:10:54 +0300 =D0=B1=D1=83=D0=BB=D0=BE =D0=BD=D0=B0=D0= =BF=D0=B8=D1=81=D0=B0=D0=BD=D0=BE Adrian Chadd > <adrian.chadd@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@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 >>> >>> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D >>> --- 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 !=3D 0) >>> + if (error !=3D 0) { >>> + if (m->m_flags & M_TXCB) >>> + ieee80211_process_callback(ni, m, 1); >>> m_freem(m); >>> + } >>> >>> URTWN_UNLOCK(sc); >>> >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ-Vmo=7XaRWb0O8B9MLXMgdPDwgBiRFONggJN3vKdvv=XVTgg>