urtw: fix unused variable assignments.

Append CWmax and retry limitation to tp->maxretry instead of rewriting it
(will restore pre-r198194 behavior).

Noticed by:	pfg, hps

Reported by:	Coverity
CID:		1304937, 1304920
This commit is contained in:
Andriy Voskoboinyk 2016-06-02 12:01:58 +00:00
parent c2d12e5e0d
commit 6fc44742fd
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=301202

View File

@ -1789,8 +1789,8 @@ urtw_tx_start(struct urtw_softc *sc, struct ieee80211_node *ni, struct mbuf *m0,
flags |= (urtw_rate2rtl(11) & 0xf) << URTW_TX_FLAG_RTSRATE_SHIFT; flags |= (urtw_rate2rtl(11) & 0xf) << URTW_TX_FLAG_RTSRATE_SHIFT;
tx->flag = htole32(flags); tx->flag = htole32(flags);
tx->retry = 3; /* CW minimum */ tx->retry = 3; /* CW minimum */
tx->retry = 7 << 4; /* CW maximum */ tx->retry |= 7 << 4; /* CW maximum */
tx->retry = URTW_TX_MAXRETRY << 8; /* retry limitation */ tx->retry |= URTW_TX_MAXRETRY << 8; /* retry limitation */
m_copydata(m0, 0, m0->m_pkthdr.len, (uint8_t *)(tx + 1)); m_copydata(m0, 0, m0->m_pkthdr.len, (uint8_t *)(tx + 1));
} }