svn commit: r262375 - in head/sys/dev/ath/ath_hal: . ah_regdomain

Hiren Panchasara hiren at FreeBSD.org
Sun Feb 23 18:07:18 UTC 2014


Author: hiren
Date: Sun Feb 23 18:07:17 2014
New Revision: 262375
URL: http://svnweb.freebsd.org/changeset/base/262375

Log:
  PicoStation M2HP presents reg domain 0x2a which is not found in atheros or linux
  reference code. Add this workaround for now.
  
  Reviewed by:	adrian

Modified:
  head/sys/dev/ath/ath_hal/ah_regdomain.c
  head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h

Modified: head/sys/dev/ath/ath_hal/ah_regdomain.c
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_regdomain.c	Sun Feb 23 17:37:24 2014	(r262374)
+++ head/sys/dev/ath/ath_hal/ah_regdomain.c	Sun Feb 23 18:07:17 2014	(r262375)
@@ -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: head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h
==============================================================================
--- head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h	Sun Feb 23 17:37:24 2014	(r262374)
+++ head/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regenum.h	Sun Feb 23 18:07:17 2014	(r262375)
@@ -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 */


More information about the svn-src-head mailing list