Date: Sun, 3 May 2015 22:30:12 +0000 (UTC) From: Adrian Chadd <adrian@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r282373 - head/sys/dev/wpi Message-ID: <201505032230.t43MUC1Z059808@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505032230.t43MUC1Z059808>