[src/trunk]: src/sys/dev/pci Set/clear the IWM_MAC_FILTER_IN_BEACON flag unde...

[nonaka <nonaka%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/20266b2c2ff6
branches:  trunk
changeset: 336517:20266b2c2ff6
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Wed Mar 04 16:53:32 2015 +0000

description:
Set/clear the IWM_MAC_FILTER_IN_BEACON flag under conditions that match what
Linux does.

>From OpenBSD rev.1.34.

diffstat:

 sys/dev/pci/if_iwm.c |  10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 8e27cab8571d -r 20266b2c2ff6 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Wed Mar 04 16:36:12 2015 +0000
+++ b/sys/dev/pci/if_iwm.c      Wed Mar 04 16:53:32 2015 +0000
@@ -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 <info%genua.de@localhost>
@@ -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 @@
        /* 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);