From owner-svn-src-all@freebsd.org Mon Sep 12 18:10:56 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 7E31FBD8CAC; Mon, 12 Sep 2016 18:10:56 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-oi0-x230.google.com (mail-oi0-x230.google.com [IPv6:2607:f8b0:4003:c06::230]) (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 47907756; Mon, 12 Sep 2016 18:10:56 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-oi0-x230.google.com with SMTP id q188so211619884oia.3; Mon, 12 Sep 2016 11:10:56 -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; bh=6VIFyNiCfTw1hnrk3+y50gARArdpNVDsmXbQWobkLl0=; b=bO4qPXI00O8TagvFxOEJxsJJwDs8A5ZyoxaprSQr3O3NQTKP0wH3pa5BdemXXq4OXM +cTzmCfl1dh/QkPTq+xr0YGWXTyCixhSbQicPejWzd32OVJc7k3Llcx0N9W8weZ6/y8F F5LDkB7rTHRVplVP30+qlCZyiqW/fjA6bDfEKxHTE0HYbIa0cukpQtoeksqDAbZGOSFx 1d5a10QSREAmJkgN6eMrHIx6GmZHqsrhbx4nI3I/puzQQli+BHWleihhMFhKG8AnawcU FNXAM3g0+1ukZXv4McSa5N7IO7Z1az+/2e7s0xCYrqgUkOFT9uMf05jKmbdeGqjfnMBa HZFA== 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; bh=6VIFyNiCfTw1hnrk3+y50gARArdpNVDsmXbQWobkLl0=; b=C8X2xuzGs9R7ZAKT4AP1iSYWYQwE+LmYBjSi7G5U3b/K8CGx6UnxO/m/QwRALq2MLq jT6qoHXjUDtclQ2m4fj3pDY6Jlo0dC21eWgWb0ilGmiI18ojgajb8+XgRHufBSw45Gll XO2y7RpsITpMngmP1ZARQyXkfhHdoZsHCgzbD/SF75u5v8RXdb16MzBnWWnejUeN+Ugt 7WZgOrExkwpyBOSeYL8PZYVgDZDJGacj7rXzeMMt/Q4NdjL5rDJGCQEJZRsyiz9NVlyX 4g+K/uUfw+FB28VNr6NQkCsq4QKKpX4hMD5FEjsShPT41rdf8IaE32vuVN8OpQCB9zIO gpMw== X-Gm-Message-State: AE9vXwNDT0M7v51lpt+ew9w2AhTUXb521/6wII+/OoWfwj/XrU62tud2/5D8xzk3rkR7uXhhObd0pffI742FQA== X-Received: by 10.202.87.76 with SMTP id l73mr440432oib.84.1473703855172; Mon, 12 Sep 2016 11:10:55 -0700 (PDT) MIME-Version: 1.0 Received: by 10.36.141.129 with HTTP; Mon, 12 Sep 2016 11:10:54 -0700 (PDT) In-Reply-To: <201609121646.u8CGkEck004615@repo.freebsd.org> References: <201609121646.u8CGkEck004615@repo.freebsd.org> From: Adrian Chadd Date: Mon, 12 Sep 2016 11:10:54 -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 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 18:10:56 -0000 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 > ============================================================================== > --- 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); > >