[src/netbsd-6-0]: src/sys/external/isc/atheros_hal/dist Pull up following rev...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/475d3740afc2
branches:  netbsd-6-0
changeset: 774728:475d3740afc2
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Dec 17 00:27:00 2012 +0000

description:
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.

diffstat:

 sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c |  4 ++--
 sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c |  2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diffs (33 lines):

diff -r 5fec9ed50f76 -r 475d3740afc2 sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c
--- a/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c Mon Dec 17 00:25:41 2012 +0000
+++ b/sys/external/isc/atheros_hal/dist/ah_eeprom_v14.c Mon Dec 17 00:27:00 2012 +0000
@@ -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 @@
        
        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) {
diff -r 5fec9ed50f76 -r 475d3740afc2 sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c
--- a/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Mon Dec 17 00:25:41 2012 +0000
+++ b/sys/external/isc/atheros_hal/dist/ah_eeprom_v4k.c Mon Dec 17 00:27:00 2012 +0000
@@ -238,7 +238,7 @@
        
        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) {