 @@ -1,38 +1,38 @@
-/*	$NetBSD: if_urtwn.c,v 1.13 2013/01/20 23:13:43 jmcneill Exp $	*/
+/*	$NetBSD: if_urtwn.c,v 1.14 2013/01/21 00:02:11 jmcneill Exp $	*/
 /*	$OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $	*/
 /*-
  * Copyright (c) 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.
  */
 /*-
  * Driver for Realtek RTL8188CE-VAU/RTL8188CUS/RTL8188RU/RTL8192CU.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.13 2013/01/20 23:13:43 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.14 2013/01/21 00:02:11 jmcneill Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #endif
 #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>
 @@ -1560,27 +1560,27 @@ urtwn_newstate_cb(struct urtwn_softc *sc
 		/* Stop Rx of data frames. */
 		urtwn_write_2(sc, R92C_RXFLTMAP2, 0);
 		/* Reset TSF. */
 		urtwn_write_1(sc, R92C_DUAL_TSF_RST, 0x03);
 		/* Disable TSF synchronization. */
 		urtwn_write_1(sc, R92C_BCN_CTRL,
 		    urtwn_read_1(sc, R92C_BCN_CTRL) |
 		      R92C_BCN_CTRL_DIS_TSF_UDT0);
 		/* Back to 20MHz mode */
-		urtwn_set_chan(sc, ic->ic_bss->ni_chan,
+		urtwn_set_chan(sc, ic->ic_curchan,
 		    IEEE80211_HTINFO_2NDCHAN_NONE);
 		if (ic->ic_opmode == IEEE80211_M_IBSS ||
 		    ic->ic_opmode == IEEE80211_M_HOSTAP) {
 			/* Stop BCN */
 			urtwn_write_1(sc, R92C_BCN_CTRL,
 			    urtwn_read_1(sc, R92C_BCN_CTRL) &
 			    ~(R92C_BCN_CTRL_EN_BCN | R92C_BCN_CTRL_TXBCN_RPT));
+		}
 		/* Reset EDCA parameters. */
 		urtwn_write_4(sc, R92C_EDCA_VO_PARAM, 0x002f3217);
 		urtwn_write_4(sc, R92C_EDCA_VI_PARAM, 0x005e4317);
 @@ -2143,28 +2143,28 @@ urtwn_tx(struct urtwn_softc *sc, struct
 	if (wh->i_fc[1] & IEEE80211_FC1_WEP) {
 		k = ieee80211_crypto_encap(ic, ni, m);
 		if (k == NULL)
 			return ENOBUFS;
 		/* packet header may have moved, reset our local pointer */
 		wh = mtod(m, struct ieee80211_frame *);
+	}
 	if (__predict_false(sc->sc_drvbpf != NULL)) {
 		struct urtwn_tx_radiotap_header *tap = &sc->sc_txtap;
 		tap->wt_flags = 0;
-		tap->wt_chan_freq = htole16(ic->ic_bss->ni_chan->ic_freq);
+		tap->wt_chan_freq = htole16(ic->ic_curchan->ic_freq);
-		tap->wt_chan_flags = htole16(ic->ic_bss->ni_chan->ic_flags);
+		tap->wt_chan_flags = htole16(ic->ic_curchan->ic_flags);
 		if (wh->i_fc[1] & IEEE80211_FC1_WEP)
 			tap->wt_flags |= IEEE80211_RADIOTAP_F_WEP;
 		bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_txtap_len, m);
+	}
 	if ((hasqos = IEEE80211_QOS_HAS_SEQ(wh))) {
 		/* data frames in 11n mode */
 		struct ieee80211_qosframe *qwh = (void *)wh;
 		tid = qwh->i_qos[0] & IEEE80211_QOS_TID;
 		qid = TID_TO_WME_AC(tid);
 	} else if (type != IEEE80211_FC0_TYPE_DATA) {
 		/* Use AC_VO for management frames. */
 @@ -3777,27 +3777,26 @@ urtwn_init(struct ifnet *ifp)
 		/* 1T1R */
 		urtwn_bb_write(sc, R92C_FPGA0_RFPARAM(0),
 		    urtwn_bb_read(sc, R92C_FPGA0_RFPARAM(0)) | __BIT(13));
+	}
 	/* Initialize GPIO setting. */
 	urtwn_write_1(sc, R92C_GPIO_MUXCFG,
 	    urtwn_read_1(sc, R92C_GPIO_MUXCFG) & ~R92C_GPIO_MUXCFG_ENBT);
 	/* Fix for lower temperature. */
 	urtwn_write_1(sc, 0x15, 0xe9);
 	/* Set default channel. */
 	ic->ic_bss->ni_chan = ic->ic_curchan;
 	urtwn_set_chan(sc, ic->ic_curchan, IEEE80211_HTINFO_2NDCHAN_NONE);
 	/* Queue Rx xfers. */
 	for (i = 0; i < URTWN_RX_LIST_COUNT; i++) {
 		data = &sc->rx_data[i];
 		usbd_setup_xfer(data->xfer, sc->rx_pipe, data, data->buf,
 		    URTWN_RXBUFSZ, USBD_SHORT_XFER_OK | USBD_NO_COPY,
 		    USBD_NO_TIMEOUT, urtwn_rxeof);
 		error = usbd_transfer(data->xfer);
 		if (__predict_false(error != USBD_NORMAL_COMPLETION &&
 		    error != USBD_IN_PROGRESS))
 			goto fail;
+	}