summaryrefslogtreecommitdiff
path: root/sys/dev/pci
diff options
context:
space:
mode:
authorStefan Sperling <stsp@cvs.openbsd.org>2017-05-03 14:53:13 +0000
committerStefan Sperling <stsp@cvs.openbsd.org>2017-05-03 14:53:13 +0000
commit0cf89f4805e9c533a9dd98b175161e58185153c0 (patch)
treeceea8c76e8acbcf271c232f99c6e1320734311ab /sys/dev/pci
parentedb020512e47cecbb6a0c495cdb3e2f849e3a21a (diff)
Fix a regression in iwm(4) which made 3165 devices unusable.
When MIMO support was added several entries in the rate table index enum got a wrong value. On most devices the firmware ended up using a Tx rate different from the rate net80211 asked for (which is bad, but not fatal). But on 3165 devices which do not support MIMO the firmware rightly raised a fatal error whenever the driver mistakenly asked for a MIMO Tx rate. Reported by Georgios Pediaditis, Steve Throckmorton, and Kai Wirt on misc@ Thanks to benno@ for providing 3165 hardware I could use to debug this.
Diffstat (limited to 'sys/dev/pci')
-rw-r--r--sys/dev/pci/if_iwmreg.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/dev/pci/if_iwmreg.h b/sys/dev/pci/if_iwmreg.h
index 288c9c456e2..3c5cfea7b23 100644
--- a/sys/dev/pci/if_iwmreg.h
+++ b/sys/dev/pci/if_iwmreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwmreg.h,v 1.26 2017/04/24 09:31:31 stsp Exp $ */
+/* $OpenBSD: if_iwmreg.h,v 1.27 2017/05/03 14:53:12 stsp Exp $ */
/******************************************************************************
*
@@ -3873,8 +3873,8 @@ enum {
IWM_RATE_MCS_4_INDEX = IWM_RATE_36M_INDEX,
IWM_RATE_MCS_10_INDEX,
IWM_RATE_48M_INDEX,
- IWM_RATE_MCS_11_INDEX,
IWM_RATE_MCS_5_INDEX = IWM_RATE_48M_INDEX,
+ IWM_RATE_MCS_11_INDEX,
IWM_RATE_54M_INDEX,
IWM_RATE_MCS_6_INDEX = IWM_RATE_54M_INDEX,
IWM_LAST_NON_HT_RATE = IWM_RATE_54M_INDEX,