Module Name: src
Committed By: nonaka
Date: Wed Mar 4 16:53:32 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
Set/clear the IWM_MAC_FILTER_IN_BEACON flag under conditions that match what
Linux does.
>From OpenBSD rev.1.34.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/sys/dev/pci/if_iwm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.24 src/sys/dev/pci/if_iwm.c:1.25
--- src/sys/dev/pci/if_iwm.c:1.24 Tue Mar 3 09:54:55 2015
+++ src/sys/dev/pci/if_iwm.c Wed Mar 4 16:53:32 2015
@@ -1,5 +1,5 @@
-/* $NetBSD: if_iwm.c,v 1.24 2015/03/03 09:54:55 nonaka Exp $ */
-/* OpenBSD: if_iwm.c,v 1.33 2015/03/03 06:56:12 kettenis Exp */
+/* $NetBSD: if_iwm.c,v 1.25 2015/03/04 16:53:32 nonaka Exp $ */
+/* OpenBSD: if_iwm.c,v 1.34 2015/03/03 20:14:34 kettenis Exp */
/*
* Copyright (c) 2014 genua mbh <i...@genua.de>
@@ -105,7 +105,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.24 2015/03/03 09:54:55 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.25 2015/03/04 16:53:32 nonaka Exp $");
#include <sys/param.h>
#include <sys/conf.h>
@@ -4971,7 +4971,9 @@ iwm_mvm_mac_ctxt_cmd_station(struct iwm_
/* Fill the common data for all mac context types */
iwm_mvm_mac_ctxt_cmd_common(sc, in, &cmd, action);
- if (in->in_assoc)
+ /* Allow beacons to pass through as long as we are not associated,or we
+ * do not have dtim period information */
+ if (!in->in_assoc || !sc->sc_ic.ic_dtim_period)
cmd.filter_flags |= htole32(IWM_MAC_FILTER_IN_BEACON);
else
cmd.filter_flags &= ~htole32(IWM_MAC_FILTER_IN_BEACON);
