Module Name: src Committed By: nonaka Date: Tue Mar 3 09:27:35 UTC 2015
Modified Files: src/sys/dev/pci: if_iwm.c Log Message: Correctly set lowest_present_ofdm in iwm_mvm_ack_rates(). >From OpenBSD rev.1.28. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 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.19 src/sys/dev/pci/if_iwm.c:1.20 --- src/sys/dev/pci/if_iwm.c:1.19 Tue Mar 3 09:22:06 2015 +++ src/sys/dev/pci/if_iwm.c Tue Mar 3 09:27:35 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwm.c,v 1.19 2015/03/03 09:22:06 nonaka Exp $ */ +/* $NetBSD: if_iwm.c,v 1.20 2015/03/03 09:27:35 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.19 2015/03/03 09:22:06 nonaka Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwm.c,v 1.20 2015/03/03 09:27:35 nonaka Exp $"); #include <sys/param.h> #include <sys/conf.h> @@ -4780,8 +4780,8 @@ iwm_mvm_ack_rates(struct iwm_softc *sc, for (i = IWM_FIRST_OFDM_RATE; i <= IWM_LAST_NON_HT_RATE; i++) { int adj = i - IWM_FIRST_OFDM_RATE; ofdm |= (1 << adj); - if (lowest_present_ofdm > adj) - lowest_present_ofdm = adj; + if (lowest_present_ofdm > i) + lowest_present_ofdm = i; } /*