 @@ -1,39 +1,39 @@
-/*	$NetBSD: rt2860.c,v 1.14 2016/06/16 15:51:13 riastradh Exp $	*/
+/*	$NetBSD: rt2860.c,v 1.15 2016/06/17 15:38:54 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.14 2016/06/16 15:51:13 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rt2860.c,v 1.15 2016/06/17 15:38:54 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>
 @@ -127,30 +127,32 @@ static void	rt2860_set_chan(struct rt286
 static void	rt3090_set_chan(struct rt2860_softc *, u_int);
 static int	rt3090_rf_init(struct rt2860_softc *);
 static void	rt3090_rf_wakeup(struct rt2860_softc *);
 static int	rt3090_filter_calib(struct rt2860_softc *, uint8_t, uint8_t,
 		    uint8_t *);
 static void	rt3090_rf_setup(struct rt2860_softc *);
 static void	rt2860_set_leds(struct rt2860_softc *, uint16_t);
 static void	rt2860_set_gp_timer(struct rt2860_softc *, int);
 static void	rt2860_set_bssid(struct rt2860_softc *, const uint8_t *);
 static void	rt2860_set_macaddr(struct rt2860_softc *, const uint8_t *);
 static void	rt2860_updateslot(struct ifnet *);
 static void	rt2860_updateprot(struct ieee80211com *);
 static int	rt2860_updateedca(struct ieee80211com *);
 #ifdef HW_CRYPTO
 static int	rt2860_set_key(struct ieee80211com *,
 		    const struct ieee80211_key *, const uint8_t *);
 static int	rt2860_delete_key(struct ieee80211com *,
 		    const struct ieee80211_key *);
 #endif
 static int8_t	rt2860_rssi2dbm(struct rt2860_softc *, uint8_t, uint8_t);
 static const char *	rt2860_get_rf(uint8_t);
 static int	rt2860_read_eeprom(struct rt2860_softc *);
 static int	rt2860_bbp_init(struct rt2860_softc *);
 static int	rt2860_txrx_enable(struct rt2860_softc *);
 static int	rt2860_init(struct ifnet *);
 static void	rt2860_stop(struct ifnet *, int);
 static int	rt2860_load_microcode(struct rt2860_softc *);
 #if 0
 static void	rt2860_calib(struct rt2860_softc *);
 #endif
 static void	rt3090_set_rx_antenna(struct rt2860_softc *, int);
 static void	rt2860_switch_chan(struct rt2860_softc *,
 @@ -368,28 +370,30 @@ rt2860_attachhook(device_t self)
 	IFQ_SET_READY(&ifp->if_snd);
 	memcpy(ifp->if_xname, device_xname(sc->sc_dev), IFNAMSIZ);
 	if_attach(ifp);
 	ieee80211_ifattach(ic);
 	ic->ic_node_alloc = rt2860_node_alloc;
 	ic->ic_newassoc = rt2860_newassoc;
 #ifdef notyet
 	ic->ic_ampdu_rx_start = rt2860_ampdu_rx_start;
 	ic->ic_ampdu_rx_stop = rt2860_ampdu_rx_stop;
 #endif
 	ic->ic_updateslot = rt2860_updateslot;
 	ic->ic_wme.wme_update = rt2860_updateedca;
 #ifdef HW_CRYPTO
 	ic->ic_crypto.cs_key_set = rt2860_set_key;
 	ic->ic_crypto.cs_key_delete = rt2860_delete_key;
 #endif
 	/* override state transition machine */
 	sc->sc_newstate = ic->ic_newstate;
 	ic->ic_newstate = rt2860_newstate;
 	ieee80211_media_init(ic, rt2860_media_change, ieee80211_media_status);
 	bpf_attach2(ifp, DLT_IEEE802_11_RADIO,
 	    sizeof (struct ieee80211_frame) + 64, &sc->sc_drvbpf);
 	sc->sc_rxtap_len = sizeof sc->sc_rxtapu;
 	sc->sc_rxtap.wr_ihdr.it_len = htole16(sc->sc_rxtap_len);
 	sc->sc_rxtap.wr_ihdr.it_present = htole32(RT2860_RX_RADIOTAP_PRESENT);
 	sc->sc_txtap_len = sizeof sc->sc_txtapu;
 @@ -1279,26 +1283,35 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 		    sizeof (struct rt2860_rxd), BUS_DMASYNC_POSTREAD);
 		if (__predict_false(!(rxd->sdl0 & htole16(RT2860_RX_DDONE)))) {
 			DPRINTF(("RXD DDONE bit not set!\n"));
 			break;	/* should not happen */
+		}
 		if (__predict_false(rxd->flags &
 		    htole32(RT2860_RX_CRCERR | RT2860_RX_ICVERR))) {
 			ifp->if_ierrors++;
 			goto skip;
+		}
 #ifdef HW_CRYPTO
 		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;
+		}
 #endif
 		MGETHDR(m1, M_DONTWAIT, MT_DATA);
 		if (__predict_false(m1 == NULL)) {
 			ifp->if_ierrors++;
 			goto skip;
+		}
 		MCLGET(m1, M_DONTWAIT);
 		if (__predict_false((m1->m_flags & M_EXT) == 0)) {
 			m_freem(m1);
 			ifp->if_ierrors++;
 			goto skip;
+		}
 		bus_dmamap_sync(sc->sc_dmat, data->map, 0,
 @@ -1331,46 +1344,41 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 		 */
 		m = data->m;
 		data->m = m1;
 		rxd->sdp0 = htole32(data->map->dm_segs[0].ds_addr);
 		rxwi = mtod(m, struct rt2860_rxwi *);
 		/* finalize mbuf */
 		m->m_data = (void *)(rxwi + 1);
 		m_set_rcvif(m, ifp);
 		m->m_pkthdr.len = m->m_len = le16toh(rxwi->len) & 0xfff;
 		wh = mtod(m, struct ieee80211_frame *);
 #ifdef HW_CRYPTO
 		if (wh->i_fc[1] & IEEE80211_FC1_PROTECTED) {
 			/* frame is decrypted by hardware */
 			wh->i_fc[1] &= ~IEEE80211_FC1_PROTECTED;
+		}
 #endif
 		/* 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((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];
 		if (__predict_true(sc->sc_drvbpf == NULL))
 			goto skipbpf;
 		tap = &sc->sc_rxtap;
 		tap->wr_flags = 0;
 		tap->wr_chan_freq = htole16(ic->ic_curchan->ic_freq);
 		tap->wr_chan_flags = htole16(ic->ic_curchan->ic_flags);
 		tap->wr_antsignal = rssi;
 		tap->wr_antenna = ant;
 		tap->wr_dbm_antsignal = rt2860_rssi2dbm(sc, rssi, ant);
 @@ -1392,26 +1400,27 @@ rt2860_rx_intr(struct rt2860_softc *sc)
 			case 0:	tap->wr_rate =  12; break;
 			case 1:	tap->wr_rate =  18; break;
 			case 2:	tap->wr_rate =  24; break;
 			case 3:	tap->wr_rate =  36; break;
 			case 4:	tap->wr_rate =  48; break;
 			case 5:	tap->wr_rate =  72; break;
 			case 6:	tap->wr_rate =  96; break;
 			case 7:	tap->wr_rate = 108; break;
+			}
 			break;
+		}
 		bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m);
 skipbpf:
 		wh = mtod(m, struct ieee80211_frame *);
 		/* grab a reference to the source node */
 		ni = ieee80211_find_rxnode(ic,
 		    (struct ieee80211_frame_min *)wh);
 		/* send the frame to the 802.11 layer */
 		ieee80211_input(ic, m, ni, rssi, 0);
 		/* node is no longer needed */
 		ieee80211_free_node(ni);
 skip:		rxd->sdl0 &= ~htole16(RT2860_RX_DDONE);
 		bus_dmamap_sync(sc->sc_dmat, sc->rxq.map,