diff options
| author | hiren <hiren@FreeBSD.org> | 2014-02-23 18:07:17 +0000 |
|---|---|---|
| committer | hiren <hiren@FreeBSD.org> | 2014-02-23 18:07:17 +0000 |
| commit | 1dd3d84818d03eb35e6b13fd2c6bda54baec829e (patch) | |
| tree | a7968b52fba8814434698a8a03184bd51c899608 | |
| parent | 3c9c635c3b66e71a5594d24b122727dd590b1ec1 (diff) | |
| download | FreeBSD-src-1dd3d84818d03eb35e6b13fd2c6bda54baec829e.zip FreeBSD-src-1dd3d84818d03eb35e6b13fd2c6bda54baec829e.tar.gz | |
PicoStation M2HP presents reg domain 0x2a which is not found in atheros or linux
reference code. Add this workaround for now.
Reviewed by: adrian
| -rw-r--r-- | sys/dev/ath/ath_hal/ah_regdomain.c | 5 | ||||
| -rw-r--r-- | sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sys/dev/ath/ath_hal/ah_regdomain.c b/sys/dev/ath/ath_hal/ah_regdomain.c index 807db44..fb0c841 100644 --- a/sys/dev/ath/ath_hal/ah_regdomain.c +++ b/sys/dev/ath/ath_hal/ah_regdomain.c @@ -169,6 +169,11 @@ isEepromValid(struct ath_hal *ah) if (regDomainPairs[i].regDmnEnum == rd) return AH_TRUE; } + + if (rd == FCC_UBNT) { + return AH_TRUE; + } + HALDEBUG(ah, HAL_DEBUG_REGDOMAIN, "%s: invalid regulatory domain/country code 0x%x\n", __func__, rd); return AH_FALSE; diff --git a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h index bc569cb..d8d211e 100644 --- a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h +++ b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h @@ -51,6 +51,7 @@ enum { FCC2_FCCA = 0x20, /* Canada */ FCC2_WORLD = 0x21, /* Australia & HK */ FCC2_ETSIC = 0x22, + FCC_UBNT = 0x2A, /* Ubiquity PicoStation M2HP */ FRANCE_RES = 0x31, /* Legacy France for OEM */ FCC3_FCCA = 0x3A, /* USA & Canada w/5470 band, 11h, DFS enabled */ FCC3_WORLD = 0x3B, /* USA & Canada w/5470 band, 11h, DFS enabled */ |
