From owner-svn-src-head@FreeBSD.ORG  Sun May  3 22:30:12 2015
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 657D77B6;
 Sun,  3 May 2015 22:30:12 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 541EE12BA;
 Sun,  3 May 2015 22:30:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t43MUCGU059809;
 Sun, 3 May 2015 22:30:12 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t43MUC1Z059808;
 Sun, 3 May 2015 22:30:12 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201505032230.t43MUC1Z059808@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Sun, 3 May 2015 22:30:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r282373 - head/sys/dev/wpi
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 03 May 2015 22:30:12 -0000

Author: adrian
Date: Sun May  3 22:30:11 2015
New Revision: 282373
URL: https://svnweb.freebsd.org/changeset/base/282373

Log:
  Remove workaround for bug 199676.
  
  PR:		kern/197143
  Submitted by:	Andriy Voskoboinyk <s3erios@gmail.com>

Modified:
  head/sys/dev/wpi/if_wpi.c

Modified: head/sys/dev/wpi/if_wpi.c
==============================================================================
--- head/sys/dev/wpi/if_wpi.c	Sun May  3 22:28:42 2015	(r282372)
+++ head/sys/dev/wpi/if_wpi.c	Sun May  3 22:30:11 2015	(r282373)
@@ -2705,9 +2705,6 @@ wpi_tx_data(struct wpi_softc *sc, struct
 		tx->id = wn->id;
 	}
 
-	if (type != IEEE80211_FC0_TYPE_MGT)
-		tx->data_ntries = tp->maxretry;
-
 	if (k != NULL && !swcrypt) {
 		switch (k->wk_cipher->ic_cipher) {
 		case IEEE80211_CIPHER_AES_CCM:
@@ -2729,6 +2726,7 @@ wpi_tx_data(struct wpi_softc *sc, struct
 	tx->ofdm_mask = 0xff;
 	tx->cck_mask = 0x0f;
 	tx->rts_ntries = 7;
+	tx->data_ntries = tp->maxretry;
 
 	tx_data.ni = ni;
 	tx_data.m = m;