Date: Sun, 23 Feb 2014 18:41:08 +0000 (UTC) From: Mark Murray <markm@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r262377 - in projects/random_number_generator/sys/dev/ath/ath_hal: . ah_regdomain Message-ID: <201402231841.s1NIf8jo070721@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markm Date: Sun Feb 23 18:41:07 2014 New Revision: 262377 URL: http://svnweb.freebsd.org/changeset/base/262377 Log: MFC - tracking commit. Modified: projects/random_number_generator/sys/dev/ath/ath_hal/ah_regdomain.c projects/random_number_generator/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h Directory Properties: projects/random_number_generator/ (props changed) projects/random_number_generator/sys/ (props changed) Modified: projects/random_number_generator/sys/dev/ath/ath_hal/ah_regdomain.c ============================================================================== --- projects/random_number_generator/sys/dev/ath/ath_hal/ah_regdomain.c Sun Feb 23 18:36:45 2014 (r262376) +++ projects/random_number_generator/sys/dev/ath/ath_hal/ah_regdomain.c Sun Feb 23 18:41:07 2014 (r262377) @@ -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; Modified: projects/random_number_generator/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h ============================================================================== --- projects/random_number_generator/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h Sun Feb 23 18:36:45 2014 (r262376) +++ projects/random_number_generator/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h Sun Feb 23 18:41:07 2014 (r262377) @@ -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 */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402231841.s1NIf8jo070721>