svn commit: r273637 - stable/9/sys/dev/usb/wlan

[Kevin Lo]

Author: kevlo
Date: Sat Oct 25 15:14:19 2014
New Revision: 273637
URL: https://svnweb.freebsd.org/changeset/base/273637

Log:
  MFC r270643, r273448:
  - Fix typo: s/mac_rev/mac_ver/
  - Fix the kernel panic in hostap mode.
    rvp->beacon_mbuf was NULL in run_update_beacon().

Modified:
  stable/9/sys/dev/usb/wlan/if_run.c   (contents, props changed)

Modified: stable/9/sys/dev/usb/wlan/if_run.c
==============================================================================
--- stable/9/sys/dev/usb/wlan/if_run.c	Sat Oct 25 15:06:09 2014	(r273636)
+++ stable/9/sys/dev/usb/wlan/if_run.c	Sat Oct 25 15:14:19 2014	(r273637)
@@ -4910,6 +4910,12 @@ run_update_beacon(struct ieee80211vap *v
 	}
 
 	setbit(rvp->bo.bo_flags, item);
+	if (rvp->beacon_mbuf == NULL) {
+		rvp->beacon_mbuf = ieee80211_beacon_alloc(vap->iv_bss,
+		    &rvp->bo);
+		if (rvp->beacon_mbuf == NULL)
+			return;
+	}
 	ieee80211_beacon_update(vap->iv_bss, &rvp->bo, rvp->beacon_mbuf, mcast);
 
 	i = RUN_CMDQ_GET(&sc->cmdq_store);
@@ -5487,7 +5493,7 @@ run_rt3070_rf_init(struct run_softc *sc)
 		run_rt3070_rf_write(sc, 17, rf);
 	}
 
-	if (sc->mac_rev == 0x3071) {
+	if (sc->mac_ver == 0x3071) {
 		run_rt3070_rf_read(sc, 1, &rf);
 		rf &= ~(RT3070_RX0_PD | RT3070_TX0_PD);
 		rf |= RT3070_RF_BLOCK | RT3070_RX1_PD | RT3070_TX1_PD;