Date: Sat, 3 Oct 2015 06:07:02 +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: r288534 - head/sys/dev/usb/wlan Message-ID: <201510030607.t93672ft027850@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: adrian Date: Sat Oct 3 06:07:01 2015 New Revision: 288534 URL: https://svnweb.freebsd.org/changeset/base/288534 Log: urtwn(4): fix sequence numbering for QoS frames Tested: * urtwn0: MAC/BB RTL8188EU, RF 6052 1T1R, STA mode Submitted by: <s3erios@gmail.com> Differential Revision: https://reviews.freebsd.org/D3684 Modified: head/sys/dev/usb/wlan/if_urtwn.c Modified: head/sys/dev/usb/wlan/if_urtwn.c ============================================================================== --- head/sys/dev/usb/wlan/if_urtwn.c Sat Oct 3 05:55:16 2015 (r288533) +++ head/sys/dev/usb/wlan/if_urtwn.c Sat Oct 3 06:07:01 2015 (r288534) @@ -1775,7 +1775,7 @@ urtwn_tx_start(struct urtwn_softc *sc, s struct r92c_tx_desc *txd; uint8_t raid, type; uint16_t sum; - int i, hasqos, xferlen; + int i, xferlen; struct usb_xfer *urtwn_pipes[4] = { sc->sc_xfer[URTWN_BULK_TX_BE], sc->sc_xfer[URTWN_BULK_TX_BK], @@ -1816,8 +1816,6 @@ urtwn_tx_start(struct urtwn_softc *sc, s break; } - hasqos = 0; - /* Fill Tx descriptor. */ txd = (struct r92c_tx_desc *)data->buf; memset(txd, 0, sizeof(*txd)); @@ -1873,7 +1871,7 @@ urtwn_tx_start(struct urtwn_softc *sc, s /* Set sequence number (already little endian). */ txd->txdseq |= *(uint16_t *)wh->i_seq; - if (!hasqos) { + if (!IEEE80211_QOS_HAS_SEQ(wh)) { /* Use HW sequence numbering for non-QoS frames. */ txd->txdw4 |= htole32(R92C_TXDW4_HWSEQ); txd->txdseq |= htole16(0x8000);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201510030607.t93672ft027850>