svn commit: r215497 - stable/8/sys/dev/usb/wlan

[Andrew Thompson]

Author: thompsa
Date: Fri Nov 19 01:46:33 2010
New Revision: 215497
URL: http://svn.freebsd.org/changeset/base/215497

Log:
  MFC r212131
  
   Fix build breakage from r212127

Modified:
  stable/8/sys/dev/usb/wlan/if_upgt.c
  stable/8/sys/dev/usb/wlan/if_urtw.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/usb/wlan/if_upgt.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_upgt.c	Fri Nov 19 01:45:34 2010	(r215496)
+++ stable/8/sys/dev/usb/wlan/if_upgt.c	Fri Nov 19 01:46:33 2010	(r215497)
@@ -652,6 +652,7 @@ upgt_set_macfilter(struct upgt_softc *sc
 	struct ifnet *ifp = sc->sc_ifp;
 	struct ieee80211com *ic = ifp->if_l2com;
 	struct ieee80211vap *vap = TAILQ_FIRST(&ic->ic_vaps);
+	struct ieee80211_node *ni;
 	struct upgt_data *data_cmd;
 	struct upgt_lmac_mem *mem;
 	struct upgt_lmac_filter *filter;
@@ -706,8 +707,6 @@ upgt_set_macfilter(struct upgt_softc *sc
 		filter->unknown3 = htole16(UPGT_FILTER_UNKNOWN3);
 		break;
 	case IEEE80211_S_RUN:
-		struct ieee80211_node *ni;
-
 		ni = ieee80211_ref_node(vap->iv_bss);
 		/* XXX monitor mode isn't tested yet.  */
 		if (vap->iv_opmode == IEEE80211_M_MONITOR) {

Modified: stable/8/sys/dev/usb/wlan/if_urtw.c
==============================================================================
--- stable/8/sys/dev/usb/wlan/if_urtw.c	Fri Nov 19 01:45:34 2010	(r215496)
+++ stable/8/sys/dev/usb/wlan/if_urtw.c	Fri Nov 19 01:46:33 2010	(r215497)
@@ -1833,6 +1833,7 @@ urtw_newstate(struct ieee80211vap *vap, 
 	struct ieee80211com *ic = vap->iv_ic;
 	struct urtw_softc *sc = ic->ic_ifp->if_softc;
 	struct urtw_vap *uvp = URTW_VAP(vap);
+	struct ieee80211_node *ni;
 	usb_error_t error = 0;
 
 	DPRINTF(sc, URTW_DEBUG_STATE, "%s: %s -> %s\n", __func__,
@@ -1853,8 +1854,6 @@ urtw_newstate(struct ieee80211vap *vap, 
 	case IEEE80211_S_ASSOC:
 		break;
 	case IEEE80211_S_RUN:
-		struct ieee80211_node *ni;
-
 		ni = ieee80211_ref_node(vap->iv_bss);
 		/* setting bssid.  */
 		urtw_write32_m(sc, URTW_BSSID, ((uint32_t *)ni->ni_bssid)[0]);