svn commit: r257948 - head/sys/dev/iwn

Adrian Chadd adrian at FreeBSD.org
Mon Nov 11 08:54:46 UTC 2013


Author: adrian
Date: Mon Nov 11 08:54:45 2013
New Revision: 257948
URL: http://svnweb.freebsd.org/changeset/base/257948

Log:
  Use IWN_NBANDS rather than a hard-coded limit.
  
  Tested:
  
  * Intel 5100, STA

Modified:
  head/sys/dev/iwn/if_iwn.c

Modified: head/sys/dev/iwn/if_iwn.c
==============================================================================
--- head/sys/dev/iwn/if_iwn.c	Mon Nov 11 08:53:20 2013	(r257947)
+++ head/sys/dev/iwn/if_iwn.c	Mon Nov 11 08:54:45 2013	(r257948)
@@ -1738,7 +1738,7 @@ iwn4965_read_eeprom(struct iwn_softc *sc
 	iwn_read_prom_data(sc, IWN4965_EEPROM_DOMAIN, sc->eeprom_domain, 4);
 
 	/* Read the list of authorized channels (20MHz ones only). */
-	for (i = 0; i < 7; i++) {
+	for (i = 0; i < IWN_NBANDS - 1; i++) {
 		addr = iwn4965_regulatory_bands[i];
 		iwn_read_eeprom_channels(sc, i, addr);
 	}
@@ -1829,7 +1829,7 @@ iwn5000_read_eeprom(struct iwn_softc *sc
 	    sc->eeprom_domain, 4);
 
 	/* Read the list of authorized channels (20MHz ones only). */
-	for (i = 0; i < 7; i++) {
+	for (i = 0; i < IWN_NBANDS - 1; i++) {
 		if (sc->hw_type >= IWN_HW_REV_TYPE_6000)
 			addr = base + iwn6000_regulatory_bands[i];
 		else


More information about the svn-src-all mailing list