From owner-svn-src-head@freebsd.org Sun Apr 2 13:24:59 2017 Return-Path: Delivered-To: svn-src-head@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 D9118D2A6C7; Sun, 2 Apr 2017 13:24:59 +0000 (UTC) (envelope-from avos@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 mx1.freebsd.org (Postfix) with ESMTPS id 903C338A; Sun, 2 Apr 2017 13:24:59 +0000 (UTC) (envelope-from avos@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v32DOwG2003553; Sun, 2 Apr 2017 13:24:58 GMT (envelope-from avos@FreeBSD.org) Received: (from avos@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v32DOwYb003552; Sun, 2 Apr 2017 13:24:58 GMT (envelope-from avos@FreeBSD.org) Message-Id: <201704021324.v32DOwYb003552@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: avos set sender to avos@FreeBSD.org using -f From: Andriy Voskoboinyk Date: Sun, 2 Apr 2017 13:24:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r316415 - head/sys/dev/iwn 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.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Apr 2017 13:25:00 -0000 Author: avos Date: Sun Apr 2 13:24:58 2017 New Revision: 316415 URL: https://svnweb.freebsd.org/changeset/base/316415 Log: iwn: use correct mask for queue ids (0xf -> 0x1f). Modified: head/sys/dev/iwn/if_iwn.c Modified: head/sys/dev/iwn/if_iwn.c ============================================================================== --- head/sys/dev/iwn/if_iwn.c Sun Apr 2 12:37:43 2017 (r316414) +++ head/sys/dev/iwn/if_iwn.c Sun Apr 2 13:24:58 2017 (r316415) @@ -3501,7 +3501,7 @@ iwn4965_tx_done(struct iwn_softc *sc, st struct iwn_rx_data *data) { struct iwn4965_tx_stat *stat = (struct iwn4965_tx_stat *)(desc + 1); - int qid = desc->qid & 0xf; + int qid = desc->qid & IWN_RX_DESC_QID_MSK; DPRINTF(sc, IWN_DEBUG_XMIT, "%s: " "qid %d idx %d RTS retries %d ACK retries %d nkill %d rate %x duration %d status %x\n", @@ -3526,7 +3526,7 @@ iwn5000_tx_done(struct iwn_softc *sc, st struct iwn_rx_data *data) { struct iwn5000_tx_stat *stat = (struct iwn5000_tx_stat *)(desc + 1); - int qid = desc->qid & 0xf; + int qid = desc->qid & IWN_RX_DESC_QID_MSK; DPRINTF(sc, IWN_DEBUG_XMIT, "%s: " "qid %d idx %d RTS retries %d ACK retries %d nkill %d rate %x duration %d status %x\n", @@ -3539,7 +3539,7 @@ iwn5000_tx_done(struct iwn_softc *sc, st #ifdef notyet /* Reset TX scheduler slot. */ - iwn5000_reset_sched(sc, desc->qid & 0xf, desc->idx); + iwn5000_reset_sched(sc, qid, desc->idx); #endif if (qid >= sc->firstaggqueue) { @@ -3559,7 +3559,7 @@ iwn_tx_done(struct iwn_softc *sc, struct int ackfailcnt, uint8_t status) { struct ieee80211_ratectl_tx_status *txs = &sc->sc_txs; - struct iwn_tx_ring *ring = &sc->txq[desc->qid & 0xf]; + struct iwn_tx_ring *ring = &sc->txq[desc->qid & IWN_RX_DESC_QID_MSK]; struct iwn_tx_data *data = &ring->data[desc->idx]; struct mbuf *m; struct ieee80211_node *ni; @@ -3833,9 +3833,9 @@ iwn_notif_intr(struct iwn_softc *sc) DPRINTF(sc, IWN_DEBUG_RECV, "%s: cur=%d; qid %x idx %d flags %x type %d(%s) len %d\n", - __func__, sc->rxq.cur, desc->qid & 0xf, desc->idx, desc->flags, - desc->type, iwn_intr_str(desc->type), - le16toh(desc->len)); + __func__, sc->rxq.cur, desc->qid & IWN_RX_DESC_QID_MSK, + desc->idx, desc->flags, desc->type, + iwn_intr_str(desc->type), le16toh(desc->len)); if (!(desc->qid & IWN_UNSOLICITED_RX_NOTIF)) /* Reply to a command. */ iwn_cmd_done(sc, desc);