PERFORCE change 151683 for review

[Sam Leffler]

http://perforce.freebsd.org/chv.cgi?CH=151683

Change 151683 by sam at sam_ebb on 2008/10/21 20:18:28

	o special case debug so we really can get to the complete channel list
	o fix more cases of indoor/outdoor mis-mapping

Affected files ...

.. //depot/projects/vap/sys/dev/ath/if_ath.c#113 edit

Differences ...

==== //depot/projects/vap/sys/dev/ath/if_ath.c#113 (text+ko) ====

@@ -5982,12 +5982,19 @@
 {
 	struct ath_softc *sc = ic->ic_ifp->if_softc;
 	struct ath_hal *ah = sc->sc_ah;
-	u_int32_t ord;
+	u_int32_t ord, regdomain, cc;
 	int error;
 
 	(void) ath_hal_getregdomain(ah, &ord);
-	ath_hal_setregdomain(ah, ath_maprd2sku(rd->regdomain, rd->country));
-	error = getchannels(sc, &nchans, chans, rd->country,
+	regdomain = rd->regdomain;
+	cc = rd->country;
+	if (regdomain == SKU_DEBUG && cc == 0) {
+		/* XXX requires special handling */
+		regdomain = 0;
+		cc = CTRY_DEBUG;
+	} else
+		ath_hal_setregdomain(ah, ath_maprd2sku(regdomain, cc));
+	error = getchannels(sc, &nchans, chans, cc,
 	     rd->ecm ? AH_TRUE : AH_FALSE,
 	     rd->location != 'I' ? AH_TRUE : AH_FALSE);
 	if (error != 0) {
@@ -5997,7 +6004,7 @@
 		ath_hal_setregdomain(ah, ord);
 		(void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country,
 		     ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE,
-		     ic->ic_regdomain.location == 'O' ? AH_TRUE : AH_FALSE);
+		     ic->ic_regdomain.location != 'I' ? AH_TRUE : AH_FALSE);
 		return error;
 	}
 	return 0;
@@ -6020,7 +6027,7 @@
 	ath_hal_setregdomain(ah, ord);
 	(void) getchannels(sc, NULL, NULL, ic->ic_regdomain.country,
 	     ic->ic_regdomain.ecm ? AH_TRUE : AH_FALSE,
-	     ic->ic_regdomain.location == 'O' ? AH_TRUE : AH_FALSE);
+	     ic->ic_regdomain.location != 'I' ? AH_TRUE : AH_FALSE);
 }
 
 static int