From 6fc44742fd8e0059ea1c55c12658462a4b397305 Mon Sep 17 00:00:00 2001 From: Andriy Voskoboinyk Date: Thu, 2 Jun 2016 12:01:58 +0000 Subject: [PATCH] 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 --- sys/dev/usb/wlan/if_urtw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/dev/usb/wlan/if_urtw.c b/sys/dev/usb/wlan/if_urtw.c index 9d91281adf2..1ab9f4ad5cb 100644 --- a/sys/dev/usb/wlan/if_urtw.c +++ b/sys/dev/usb/wlan/if_urtw.c @@ -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; tx->flag = htole32(flags); tx->retry = 3; /* CW minimum */ - tx->retry = 7 << 4; /* CW maximum */ - tx->retry = URTW_TX_MAXRETRY << 8; /* retry limitation */ + tx->retry |= 7 << 4; /* CW maximum */ + tx->retry |= URTW_TX_MAXRETRY << 8; /* retry limitation */ m_copydata(m0, 0, m0->m_pkthdr.len, (uint8_t *)(tx + 1)); }