Module Name: src
Committed By: riz
Date: Mon Dec 17 00:27:00 UTC 2012
Modified Files:
src/sys/external/isc/atheros_hal/dist [netbsd-6-0]: ah_eeprom_v14.c
ah_eeprom_v4k.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #754):
sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c: revision 1.6
sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c: revision 1.4
Fix off by one read error.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.5.16.1 \
src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c
cvs rdiff -u -r1.1 -r1.1.20.1 \
src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.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/external/isc/atheros_hal/dist/ah_eeprom_v14.c
diff -u src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5.16.1
--- src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c:1.5 Mon Mar 7 11:25:42 2011
+++ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c Mon Dec 17 00:27:00 2012
@@ -14,7 +14,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
- * $Id: ah_eeprom_v14.c,v 1.5 2011/03/07 11:25:42 cegger Exp $
+ * $Id: ah_eeprom_v14.c,v 1.5.16.1 2012/12/17 00:27:00 riz Exp $
*/
#include "opt_ah.h"
@@ -255,7 +255,7 @@ v14EepromReadCTLInfo(struct ath_hal *ah,
HALASSERT(AR5416_NUM_CTLS <= sizeof(ee->ee_rdEdgesPower)/NUM_EDGES);
- for (i = 0; ee->ee_base.ctlIndex[i] != 0 && i < AR5416_NUM_CTLS; i++) {
+ for (i = 0; i < AR5416_NUM_CTLS && ee->ee_base.ctlIndex[i] != 0; i++) {
for (j = 0; j < NUM_EDGES; j ++) {
/* XXX Confirm this is the right thing to do when an invalid channel is stored */
if (ee->ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {
Index: src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c
diff -u src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1 src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1.20.1
--- src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c:1.1 Sun Feb 20 11:21:02 2011
+++ src/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Mon Dec 17 00:27:00 2012
@@ -238,7 +238,7 @@ v4kEepromReadCTLInfo(struct ath_hal *ah,
HALASSERT(AR5416_4K_NUM_CTLS <= sizeof(ee->ee_rdEdgesPower)/NUM_EDGES);
- for (i = 0; ee->ee_base.ctlIndex[i] != 0 && i < AR5416_4K_NUM_CTLS; i++) {
+ for (i = 0; i < AR5416_4K_NUM_CTLS && ee->ee_base.ctlIndex[i] != 0; i++) {
for (j = 0; j < NUM_EDGES; j ++) {
/* XXX Confirm this is the right thing to do when an invalid channel is stored */
if (ee->ee_base.ctlData[i].ctlEdges[CTL_CHAIN][j].bChannel == AR5416_BCHAN_UNUSED) {
