From owner-svn-src-all@freebsd.org Mon Sep 12 20:35:57 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 683D3BD8790; Mon, 12 Sep 2016 20:35:57 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-it0-x232.google.com (mail-it0-x232.google.com [IPv6:2607:f8b0:4001:c0b::232]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 30E3F86F; Mon, 12 Sep 2016 20:35:57 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-it0-x232.google.com with SMTP id 186so27971475itf.0; Mon, 12 Sep 2016 13:35:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=TjE5xudLs/08O7nNzSYpSdyjONVLUM+vIZElrmL7aeE=; b=DHSj5oQ4D5k3J3/K54YSnzOJ66wJiMZkYWki1On2E6hrLz/VjEYlkYpUE5ThDAyp9F zF7ocfjrNkGSqEEYho2+lKTWcFnGwnijahb/rqkoGFvH71i0OFAMj8EVmfDiYmVe5h+P HP6m37eT7mkZQ0YEdQYx8uSsNjHiJyAKWbOxFKgGRC0/oSCOuSrc4X1AN2r9ZQsNjJvH nHfbyzzCchEVgz5NzSFlVPWpSYwHzGKezfnXFGr3nTi0Xqu99Np9yLuB33fHVhabhKzA pr88cyoWFwJ2O2PwyEH8DDFeFipCtjJlMsbWLCRpo1Iq0LWrcQR6b9trJX768+jZWuGp YSmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=TjE5xudLs/08O7nNzSYpSdyjONVLUM+vIZElrmL7aeE=; b=OyUaRJ/IEn2fZJVFexLWLMn3Tf+tA2s5ZxO9AESTrPPV6wrKVZ9Y/JUHg9FxIMiH/Q MODQedHZTkQEExszv25W2GJ1t4sZcP02xuoTmqG8kJirUtTQPLQ7UdFPu5xhdA+X8gOZ Gbl/ypDUxHBpqI2VYml/ffeQbJQ4FLBkL+oqhygCPi3g+KTYwYkSI+L696mXDZQmRmuZ 1LU6ye+ZBYxXwSE7ELcTwNqWcYn9qaoNwauGoCsNIzn/kea8qhY7d23Z3WEadZNKGIO7 dH8imr2uxMpBXVuqSqojccJat8FAWq18MMKEyxALyLUd22YHOkeavVg6f4U0D7TcsvAv OcIw== X-Gm-Message-State: AE9vXwOJNXE8DcqOIMHzneFPG04/4lBCt/HHTui0fFeRyJ5Z6rnX0isetvBJDLqmGgbAzRcb3I4npmEj/SqhYQ== X-Received: by 10.157.57.137 with SMTP id y9mr28521858otb.21.1473712556260; Mon, 12 Sep 2016 13:35:56 -0700 (PDT) MIME-Version: 1.0 Received: by 10.36.141.129 with HTTP; Mon, 12 Sep 2016 13:35:55 -0700 (PDT) In-Reply-To: References: <201609121646.u8CGkEck004615@repo.freebsd.org> From: Adrian Chadd Date: Mon, 12 Sep 2016 13:35:55 -0700 Message-ID: Subject: Re: svn commit: r305745 - head/sys/dev/urtwn To: Andriy Voskoboinyk Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 Sep 2016 20:35:57 -0000 Ah, ugh, that thing.. :( -adrian On 12 September 2016 at 11:40, Andriy Voskoboinyk 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 > : > > 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 >> 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); >>> >