[src/trunk]: src/sys/dev/pci Make setting the MAC context bit for 11g protect...

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

details:   https://anonhg.NetBSD.org/src/rev/e198e4add35e
branches:  trunk
changeset: 336484:e198e4add35e
user:      nonaka <nonaka%NetBSD.org@localhost>
date:      Tue Mar 03 09:45:58 2015 +0000

description:
Make setting the MAC context bit for 11g protection when transmitting
OFDM frames conditional on the node via IEEE80211_F_USEPROT.

>From OpenBSD rev.1.31.

diffstat:

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

diffs (28 lines):

diff -r 00026bcba497 -r e198e4add35e sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c      Tue Mar 03 09:41:31 2015 +0000
+++ b/sys/dev/pci/if_iwm.c      Tue Mar 03 09:45:58 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_iwm.c,v 1.22 2015/03/03 09:41:31 nonaka Exp $       */
+/*     $NetBSD: if_iwm.c,v 1.23 2015/03/03 09:45:58 nonaka Exp $       */
 /*     OpenBSD: if_iwm.c,v 1.18 2015/02/11 01:12:42 brad Exp   */
 
 /*
@@ -105,7 +105,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.22 2015/03/03 09:41:31 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.23 2015/03/03 09:45:58 nonaka Exp $");
 
 #include <sys/param.h>
 #include <sys/conf.h>
@@ -4883,7 +4883,8 @@
                cmd->ac[txf].edca_txop = 0;
        }
 
-       cmd->protection_flags |= htole32(IWM_MAC_PROT_FLG_TGG_PROTECT);
+       if (ic->ic_flags & IEEE80211_F_USEPROT)
+               cmd->protection_flags |= htole32(IWM_MAC_PROT_FLG_TGG_PROTECT);
 
        cmd->filter_flags = htole32(IWM_MAC_FILTER_ACCEPT_GRP);
 }