From owner-p4-projects@FreeBSD.ORG Wed Feb 20 18:36:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 986BA16A403; Wed, 20 Feb 2008 18:36:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4588616A401 for ; Wed, 20 Feb 2008 18:36:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2ADDE13C4EC for ; Wed, 20 Feb 2008 18:36:40 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m1KIaecr081746 for ; Wed, 20 Feb 2008 18:36:40 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m1KIaetD081743 for perforce@freebsd.org; Wed, 20 Feb 2008 18:36:40 GMT (envelope-from sam@freebsd.org) Date: Wed, 20 Feb 2008 18:36:40 GMT Message-Id: <200802201836.m1KIaetD081743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 135819 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Feb 2008 18:36:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=135819 Change 135819 by sam@sam_ebb on 2008/02/20 18:36:19 set bssid mask according to mac addresses being used Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath.c#32 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#16 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath.c#32 (text+ko) ==== @@ -590,6 +590,8 @@ /* get mac address from hardware */ ath_hal_getmac(ah, ic->ic_myaddr); + if (sc->sc_hasbmask) + ath_hal_getbssidmask(ah, sc->sc_hwbssidmask); /* NB: used to size node table key mapping array */ ic->ic_max_keyix = sc->sc_keymax; @@ -690,8 +692,10 @@ for (i = 0; i < 32; i++) if ((sc->sc_bssidmask & (1<sc_hwbssidmask[0] &= ~mac[0]; + } } else i = 0; sc->sc_bssidmask |= 1<> 2; - if (i != 0 || --sc->sc_nbssid0 == 0) + if (i != 0 || --sc->sc_nbssid0 == 0) { sc->sc_bssidmask &= ~(1<sc_hwbssidmask[0] |= mac[0]; + /* put back U/L bit if any other vaps need it */ + if (sc->sc_bssidmask & ~1) + sc->sc_hwbssidmask[0] &= ~0x2; + } } + /* * Assign a beacon xmit slot. We try to space out * assignments so when beacons are staggered the @@ -816,8 +826,10 @@ } /* STA, AHDEMO? */ - if (opmode == IEEE80211_M_HOSTAP) + if (opmode == IEEE80211_M_HOSTAP) { assign_address(sc, mac, flags & IEEE80211_CLONE_BSSID); + ath_hal_setbssidmask(sc->sc_ah, sc->sc_hwbssidmask); + } vap = &avp->av_vap; /* XXX can't hold mutex across if_alloc */ @@ -967,6 +979,7 @@ sc->sc_swbmiss = 0; } else if (vap->iv_opmode == IEEE80211_M_HOSTAP) { reclaim_address(sc, vap->iv_myaddr); + ath_hal_setbssidmask(ah, sc->sc_hwbssidmask); } if (vap->iv_opmode != IEEE80211_M_WDS) sc->sc_nvaps--; ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#16 (text+ko) ==== @@ -206,6 +206,7 @@ int sc_debug; int sc_nvaps; /* # vaps */ int sc_nstavaps; /* # station vaps */ + u_int8_t sc_hwbssidmask[IEEE80211_ADDR_LEN]; u_int8_t sc_nbssid0; /* # vap's using base mac */ uint32_t sc_bssidmask; /* bssid mask */ @@ -373,6 +374,10 @@ ((*(_ah)->ah_getMacAddress)((_ah), (_mac))) #define ath_hal_setmac(_ah, _mac) \ ((*(_ah)->ah_setMacAddress)((_ah), (_mac))) +#define ath_hal_getbssidmask(_ah, _mask) \ + ((*(_ah)->ah_getBssIdMask)((_ah), (_mask))) +#define ath_hal_setbssidmask(_ah, _mask) \ + ((*(_ah)->ah_setBssIdMask)((_ah), (_mask))) #define ath_hal_intrset(_ah, _mask) \ ((*(_ah)->ah_setInterrupts)((_ah), (_mask))) #define ath_hal_intrget(_ah) \