summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjsg <jsg@openbsd.org>2015-03-02 22:31:03 +0000
committerjsg <jsg@openbsd.org>2015-03-02 22:31:03 +0000
commitae883b5c5ee55dace4177bff201da8944be79577 (patch)
tree1eefc29a353afd59494e98e8dcb3610c4a28b2d8
parentDon't set CTS to self. Linux stopped setting this back in (diff)
downloadwireguard-openbsd-ae883b5c5ee55dace4177bff201da8944be79577.tar.xz
wireguard-openbsd-ae883b5c5ee55dace4177bff201da8944be79577.zip
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);
}