 @@ -1,39 +1,39 @@
-/*	$NetBSD: rt2860.c,v 1.6 2016/05/02 17:37:23 christos Exp $	*/
+/*	$NetBSD: rt2860.c,v 1.7 2016/05/03 00:19:32 christos Exp $	*/
 /*	$OpenBSD: rt2860.c,v 1.90 2016/04/13 10:49:26 mpi Exp $	*/
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
+ *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
+ *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
  * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 /*-
  * Ralink Technology RT2860/RT3090/RT3390/RT3562 chipset driver
  * http://www.ralinktech.com/
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.6 2016/05/02 17:37:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.7 2016/05/03 00:19:32 christos Exp $");
 #include <sys/param.h>
 #include <sys/sockio.h>
 #include <sys/sysctl.h>
 #include <sys/mbuf.h>
 #include <sys/kernel.h>
 #include <sys/socket.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/queue.h>
 #include <sys/callout.h>
 #include <sys/module.h>
 #include <sys/conf.h>
 @@ -1197,28 +1197,29 @@ rt2860_tx_intr(struct rt2860_softc *sc,
 			ieee80211_free_node(data->ni);
 			data->ni = NULL;
 			SLIST_INSERT_HEAD(&sc->data_pool, data, next);
 			ring->data[ring->next] = NULL;
 			ifp->if_opackets++;
+		}
 		ring->queued--;
 		ring->next = (ring->next + 1) % RT2860_TX_RING_COUNT;
+	}
 	sc->sc_tx_timer = 0;
-	if (ring->queued < RT2860_TX_RING_ONEMORE)
+	if (ring->queued <= RT2860_TX_RING_ONEMORE)
 		sc->qfullmsk &= ~(1 << qid);
 	ifp->if_flags &= ~IFF_OACTIVE;
 	rt2860_start(ifp);
+}
 /*
  * Return the Rx chain with the highest RSSI for a given frame.
  */
 static __inline uint8_t
 rt2860_maxrssi_chain(struct rt2860_softc *sc, const struct rt2860_rxwi *rxwi)
+{
 	uint8_t rxchain = 0;
 	if (sc->nrxchains > 1) {
 		if (rxwi->rssi[1] > rxwi->rssi[rxchain])
 @@ -1314,27 +1315,27 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 		/* finalize mbuf */
 		m->m_data = (void *)(rxwi + 1);
 		m->m_pkthdr.len = m->m_len = le16toh(rxwi->len) & 0xfff;
 		wh = mtod(m, struct ieee80211_frame *);
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			/* frame is decrypted by hardware */
 			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
+		}
 		/* HW may insert 2 padding bytes after 802.11 header */
 		if (rxd->flags & htole32(RT2860_RX_L2PAD)) {
 			u_int hdrlen = ieee80211_hdrspace(ic, wh);
-			memmove(wh + 2, wh, hdrlen);
+			memmove((char *)wh + 2, wh, hdrlen);
 			m->m_data += 2;
 			wh = mtod(m, struct ieee80211_frame *);
+		}
 		if (__predict_false(rxd->flags & htole32(RT2860_RX_MICERR))) {
 			/* report MIC failures to net80211 for TKIP */
 			ieee80211_notify_michael_failure(ic, wh, 0/* XXX */);
 			ifp->if_ierrors++;
 			goto skip;
+		}
 		ant = rt2860_maxrssi_chain(sc, rxwi);
 		rssi = rxwi->rssi[ant];
 @@ -1479,28 +1480,29 @@ rt2860_intr(void *arg)
 	if (r & RT2860_TX_DONE_INT2)
 		rt2860_tx_intr(sc, 2);
 	if (r & RT2860_TX_DONE_INT1)
 		rt2860_tx_intr(sc, 1);
 	if (r & RT2860_TX_DONE_INT0)
 		rt2860_tx_intr(sc, 0);
 	if (r & RT2860_MAC_INT_0)	/* TBTT */
 		rt2860_tbtt_intr(sc);
-	if (r & RT2860_MAC_INT_3)	/* Auto wakeup */
+	if (r & RT2860_MAC_INT_3) {	/* Auto wakeup */
-		/* TBD wakeup */{};
+		/* TBD wakeup */
+	}
 	if (r & RT2860_MAC_INT_4)	/* GP timer */
 		rt2860_gp_intr(sc);
 	return 1;
+}
 static int
 rt2860_tx(struct rt2860_softc *sc, struct mbuf *m, struct ieee80211_node *ni)
+{
 	struct ieee80211com *ic = &sc->sc_ic;
 	struct rt2860_node *rn = (void *)ni;
 	struct rt2860_tx_ring *ring;