From owner-svn-src-stable@freebsd.org  Wed Oct 31 23:03:00 2018
Return-Path: <owner-svn-src-stable@freebsd.org>
Delivered-To: svn-src-stable@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 33CC910EBF1A;
 Wed, 31 Oct 2018 23:03:00 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CA9366FA87;
 Wed, 31 Oct 2018 23:02:59 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A6097130D3;
 Wed, 31 Oct 2018 23:02:59 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9VN2x5o008916;
 Wed, 31 Oct 2018 23:02:59 GMT (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9VN2xxw008915;
 Wed, 31 Oct 2018 23:02:59 GMT (envelope-from glebius@FreeBSD.org)
Message-Id: <201810312302.w9VN2xxw008915@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: glebius set sender to
 glebius@FreeBSD.org using -f
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Wed, 31 Oct 2018 23:02:59 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject: svn commit: r339975 - stable/12/sys/dev/ipw
X-SVN-Group: stable-12
X-SVN-Commit-Author: glebius
X-SVN-Commit-Paths: stable/12/sys/dev/ipw
X-SVN-Commit-Revision: 339975
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable>, 
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable/>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 31 Oct 2018 23:03:00 -0000

Author: glebius
Date: Wed Oct 31 23:02:59 2018
New Revision: 339975
URL: https://svnweb.freebsd.org/changeset/base/339975

Log:
  MFhead r339643:
  
    Fix ipw_start(), where logic was reverted in r287197.
  
  PR		232554
  Approved by:	re (kib)

Modified:
  stable/12/sys/dev/ipw/if_ipw.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/ipw/if_ipw.c
==============================================================================
--- stable/12/sys/dev/ipw/if_ipw.c	Wed Oct 31 22:55:43 2018	(r339974)
+++ stable/12/sys/dev/ipw/if_ipw.c	Wed Oct 31 23:02:59 2018	(r339975)
@@ -1732,7 +1732,7 @@ ipw_start(struct ipw_softc *sc)
 
 	IPW_LOCK_ASSERT(sc);
 
-	while (sc->txfree < 1 + IPW_MAX_NSEG &&
+	while (sc->txfree >= 1 + IPW_MAX_NSEG &&
 	    (m = mbufq_dequeue(&sc->sc_snd)) != NULL) {
 		ni = (struct ieee80211_node *) m->m_pkthdr.rcvif;
 		if (ipw_tx_start(sc, m, ni) != 0) {