summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2015-03-02 22:31:04 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2015-03-02 22:31:04 +0000
commit54b2942b4496ed690cbd0ec03a9118f8097150f4 (patch)
tree2e8dfa96e808d877a1d5cbd8a776bac59266b48a
parentc082f2c15d165ddae2bf03c9553d88602cb07d7e (diff)
Make setting the MAC context bit for 11g protection when transmitting
OFDM frames conditional on the node via IEEE80211_F_USEPROT. ok kettenis@
-rw-r--r--sys/dev/pci/if_iwm.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwm.c b/sys/dev/pci/if_iwm.c
index 76b213d852d..3679cc9959e 100644
--- a/sys/dev/pci/if_iwm.c
+++ b/sys/dev/pci/if_iwm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwm.c,v 1.30 2015/03/02 22:19:12 jsg Exp $ */
+/* $OpenBSD: if_iwm.c,v 1.31 2015/03/02 22:31:03 jsg Exp $ */
/*
* Copyright (c) 2014 genua mbh <info@genua.de>
@@ -4789,7 +4789,8 @@ iwm_mvm_mac_ctxt_cmd_common(struct iwm_softc *sc, struct iwm_node *in,
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);
}