From owner-svn-src-projects@FreeBSD.ORG Sun Feb 23 18:41:08 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97B0D7B1; Sun, 23 Feb 2014 18:41:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7BE2B18B8; Sun, 23 Feb 2014 18:41:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1NIf8tG070723; Sun, 23 Feb 2014 18:41:08 GMT (envelope-from markm@svn.freebsd.org) Received: (from markm@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1NIf8jo070721; Sun, 23 Feb 2014 18:41:08 GMT (envelope-from markm@svn.freebsd.org) Message-Id: <201402231841.s1NIf8jo070721@svn.freebsd.org> From: Mark Murray Date: Sun, 23 Feb 2014 18:41:08 +0000 (UTC) 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 X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 23 Feb 2014 18:41:08 -0000 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 */