Attachment 156169 Details for Bug 197143 – Add wpi_check_bss_filter()

[patch] Add wpi_check_bss_filter()

patch-wpi78.diff (text/plain), 1.18 KB, created by Andriy Voskoboinyk on 2015-04-30 20:52:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andriy Voskoboinyk

Created: 2015-04-30 20:52:20 UTC

Size: 1.18 KB

patch

obsolete

>Index: sys/dev/wpi/if_wpi.c
>===================================================================
>--- sys/dev/wpi/if_wpi.c	(revision 281839)
>+++ sys/dev/wpi/if_wpi.c	(working copy)
>@@ -1651,6 +1651,12 @@
> 	sc->sc_node_free(ni);
> }
> 
>+static __inline int
>+wpi_check_bss_filter(struct wpi_softc *sc)
>+{
>+	return (sc->rxon.filter & htole32(WPI_FILTER_BSS)) != 0;
>+}
>+
> /**
>  * Called by net80211 when ever there is a change to 80211 state machine
>  */
>@@ -1681,7 +1687,7 @@
> 	switch (nstate) {
> 	case IEEE80211_S_SCAN:
> 		WPI_RXON_LOCK(sc);
>-		if ((sc->rxon.filter & htole32(WPI_FILTER_BSS)) &&
>+		if (wpi_check_bss_filter(sc) != 0 &&
> 		    vap->iv_opmode != IEEE80211_M_STA) {
> 			sc->rxon.filter &= ~htole32(WPI_FILTER_BSS);
> 			if ((error = wpi_send_rxon(sc, 0, 1)) != 0) {
>@@ -1749,7 +1755,7 @@
> {
> 	struct wpi_softc *sc = arg;
> 
>-	if (!(sc->rxon.filter & htole32(WPI_FILTER_BSS)))
>+	if (wpi_check_bss_filter(sc) == 0)
> 		return;
> 
> 	wpi_power_calibration(sc);
>@@ -3642,7 +3648,7 @@
> 	if (async)
> 		WPI_RXON_LOCK_ASSERT(sc);
> 
>-	if (assoc && (sc->rxon.filter & htole32(WPI_FILTER_BSS))) {
>+	if (assoc && wpi_check_bss_filter(sc) != 0) {
> 		struct wpi_assoc rxon_assoc;
> 
> 		rxon_assoc.flags = sc->rxon.flags;

Actions: View | Diff

Attachments on bug 197143: 152282 | 152662 | 152977 | 153911 | 153977 | 153983 | 153985 | 153999 | 154000 | 154002 | 154006 | 154007 | 154009 | 154010 | 154011 | 154013 | 154015 | 154016 | 154017 | 154019 | 154020 | 154021 | 154022 | 154024 | 154026 | 154030 | 154032 | 154033 | 154328 | 154329 | 154330 | 154332 | 154334 | 154335 | 154336 | 154337 | 154338 | 154340 | 154341 | 154343 | 154346 | 154347 | 154348 | 154349 | 154350 | 154351 | 154352 | 154353 | 154354 | 154355 | 154356 | 154357 | 154358 | 154359 | 154360 | 154361 | 154362 | 154363 | 154364 | 154365 | 154366 | 154368 | 154369 | 154370 | 154371 | 154372 | 154373 | 154374 | 154375 | 154378 | 154379 | 154380 | 154381 | 154382 | 154383 | 154384 | 155332 | 155333 | 156164 | 156165 | 156166 | 156167 | 156168 | 156169 | 156170 | 156171 | 156172 | 156173 | 156174 | 156175 | 156176 | 156177 | 156178 | 156179 | 156180 | 156181 | 156182 | 156183 | 156184 | 156185 | 156186 | 156187 | 156188 | 156189 | 156190 | 156191 | 156192 | 156193 | 156194 | 156195