Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 34a0a202 authored by Senthil Balasubramanian's avatar Senthil Balasubramanian Committed by John W. Linville
Browse files

ath: Add a missing world regulatory domain 0x6C 



Some customers use 0x6C world regulatory domain and this patch
adds the support.

Cc: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: default avatarSenthil Balasubramanian <senthilkumar@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9f219bd2

drivers/net/wireless/ath/regd.c

+4 −3
Original line number Diff line number Diff line
@@ -97,8 +97,8 @@ static const struct ieee80211_regdomain ath_world_regdom_66_69 = { 
	}

};



/* Can be used by 0x67, 0x6A and 0x68 */

static const struct ieee80211_regdomain ath_world_regdom_67_68_6A = {

/* Can be used by 0x67, 0x68, 0x6A and 0x6C */

static const struct ieee80211_regdomain ath_world_regdom_67_68_6A_6C = {

	.n_reg_rules = 4,

	.alpha2 =  "99",

	.reg_rules = {
@@ -151,7 +151,8 @@ ieee80211_regdomain *ath_world_regdomain(struct ath_regulatory *reg) 
	case 0x67:

	case 0x68:

	case 0x6A:

		return &ath_world_regdom_67_68_6A;

	case 0x6C:

		return &ath_world_regdom_67_68_6A_6C;

	default:

		WARN_ON(1);

		return ath_default_world_regdomain();

drivers/net/wireless/ath/regd_common.h

+2 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ enum EnumRd { 
	WOR9_WORLD = 0x69,

	WORA_WORLD = 0x6A,

	WORB_WORLD = 0x6B,

	WORC_WORLD = 0x6C,



	MKK3_MKKB = 0x80,

	MKK3_MKKA2 = 0x81,
@@ -282,6 +283,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = { 
	{WOR9_WORLD, NO_CTL, NO_CTL},

	{WORA_WORLD, NO_CTL, NO_CTL},

	{WORB_WORLD, NO_CTL, NO_CTL},

	{WORC_WORLD, NO_CTL, NO_CTL},

};



static struct country_code_to_enum_rd allCountries[] = {