Module Name: src
Committed By: nonaka
Date: Tue Mar 3 09:45:58 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 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.22 src/sys/dev/pci/if_iwm.c:1.23
--- src/sys/dev/pci/if_iwm.c:1.22 Tue Mar 3 09:41:31 2015
+++ src/sys/dev/pci/if_iwm.c Tue Mar 3 09:45:58 2015
@@ -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 @@ iwm_mvm_mac_ctxt_cmd_common(struct iwm_s
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);
}
