| Message ID | dd4aa95d-c7e6-f582-48bd-c7d6f8cdc8b2@debitel.net (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | Patch for Atheros QCA6174 | expand |
On 9/14/21 9:59 AM, Andreas Tepe wrote: > @@ -426,6 +428,7 @@ static struct country_code_to_enum_rd allCountries[] = { > {CTRY_KOREA_ROC, APL9_WORLD, "KR"}, > {CTRY_KOREA_ROC2, APL2_WORLD, "K2"}, > {CTRY_KOREA_ROC3, APL9_WORLD, "K3"}, > + {CTRY_KOREA_ROC, APL10_WORLD, "KR"}, > {CTRY_KUWAIT, ETSI3_WORLD, "KW"}, > {CTRY_LATVIA, ETSI1_WORLD, "LV"}, > {CTRY_LEBANON, NULL1_WORLD, "LB"}, The same country number CTRY_KOREA_ROC(410) cannot be used for different regDomainPairs. Thanks, Peter
Hello Peter, thanks for the information and the very quick answer! When I saw that in the patch, I had the same question, but it still worked. I have to admit that I copied it without knowing why it works. Who defines the codes? Is it possible to set it to CTRY_KOREA_ROC4 which is not in use yet? In that case drivers/net/wireless/ath/regd.h also would need an additional entry line after row 128 CTRY_KOREA_ROC4 = 413, 413 apparently is not in use yet. Cheers, Andreas Am 14.09.21 um 20:07 schrieb Peter Oh: > > On 9/14/21 9:59 AM, Andreas Tepe wrote: >> @@ -426,6 +428,7 @@ static struct country_code_to_enum_rd >> allCountries[] = { >> {CTRY_KOREA_ROC, APL9_WORLD, "KR"}, >> {CTRY_KOREA_ROC2, APL2_WORLD, "K2"}, >> {CTRY_KOREA_ROC3, APL9_WORLD, "K3"}, >> + {CTRY_KOREA_ROC, APL10_WORLD, "KR"}, >> {CTRY_KUWAIT, ETSI3_WORLD, "KW"}, >> {CTRY_LATVIA, ETSI1_WORLD, "LV"}, >> {CTRY_LEBANON, NULL1_WORLD, "LB"}, > > The same country number CTRY_KOREA_ROC(410) cannot be used for different > regDomainPairs. > > > Thanks, > > Peter >
Hello Peter,
here the patches for kernel linux-5.15-rc1:
diff --git a/linux-5.15-rc1/drivers/net/wireless/ath/regd_common.h~
b/linux-5.15-rc1/drivers/net/wireless/ath/regd_common.h
index c4bd26e..cdb1e9a 100644
--- a/linux-5.15-rc1/drivers/net/wireless/ath/regd_common.h~
+++ b/linux-5.15-rc1/drivers/net/wireless/ath/regd_common.h
@@ -76,6 +76,7 @@ enum EnumRd {
APL7_FCCA = 0x5C,
APL8_WORLD = 0x5D,
APL9_WORLD = 0x5E,
+ APL10_WORLD = 0x5F,
WOR0_WORLD = 0x60,
WOR1_WORLD = 0x61,
@@ -204,6 +205,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = {
{APL6_WORLD, CTL_ETSI, CTL_ETSI},
{APL8_WORLD, CTL_ETSI, CTL_ETSI},
{APL9_WORLD, CTL_ETSI, CTL_ETSI},
+ {APL10_WORLD, CTL_ETSI, CTL_ETSI},
{APL3_FCCA, CTL_FCC, CTL_FCC},
{APL7_FCCA, CTL_FCC, CTL_FCC},
@@ -426,6 +428,7 @@ static struct country_code_to_enum_rd allCountries[] = {
{CTRY_KOREA_ROC, APL9_WORLD, "KR"},
{CTRY_KOREA_ROC2, APL2_WORLD, "K2"},
{CTRY_KOREA_ROC3, APL9_WORLD, "K3"},
+ {CTRY_KOREA_ROC4, APL10_WORLD, "K4"},
{CTRY_KUWAIT, ETSI3_WORLD, "KW"},
{CTRY_LATVIA, ETSI1_WORLD, "LV"},
{CTRY_LEBANON, NULL1_WORLD, "LB"},
diff --git a/linux-5.15-rc1/drivers/net/wireless/ath/regd.h~
b/linux-5.15-rc1/drivers/net/wireless/ath/regd.h
index 8d5a16b..774419c 100644
--- a/linux-5.15-rc1/drivers/net/wireless/ath/regd.h~
+++ b/linux-5.15-rc1/drivers/net/wireless/ath/regd.h
@@ -126,6 +126,7 @@ enum CountryCode {
CTRY_KOREA_ROC = 410,
CTRY_KOREA_ROC2 = 411,
CTRY_KOREA_ROC3 = 412,
+ CTRY_KOREA_ROC4 = 413,
CTRY_KUWAIT = 414,
CTRY_LATVIA = 428,
CTRY_LEBANON = 422,
Kind regards,
Andreas
Am 14.09.21 um 20:07 schrieb Peter Oh:
>
> On 9/14/21 9:59 AM, Andreas Tepe wrote:
>> @@ -426,6 +428,7 @@ static struct country_code_to_enum_rd
>> allCountries[] = {
>> {CTRY_KOREA_ROC, APL9_WORLD, "KR"},
>> {CTRY_KOREA_ROC2, APL2_WORLD, "K2"},
>> {CTRY_KOREA_ROC3, APL9_WORLD, "K3"},
>> + {CTRY_KOREA_ROC, APL10_WORLD, "KR"},
>> {CTRY_KUWAIT, ETSI3_WORLD, "KW"},
>> {CTRY_LATVIA, ETSI1_WORLD, "LV"},
>> {CTRY_LEBANON, NULL1_WORLD, "LB"},
>
> The same country number CTRY_KOREA_ROC(410) cannot be used for different
> regDomainPairs.
>
>
> Thanks,
>
> Peter
>
On 9/15/21 9:00 AM, Andreas Tepe wrote: > Hello Peter, > > here the patches for kernel linux-5.15-rc1: For the upstream reviewers, you need to add a root cause analysis(why the error happens) and about how your patch fixes the problem. Take a read https://www.kernel.org/doc/html/latest/process/submitting-patches.html# for about submitting patches and follow the instruction, otherwise your patch maybe not getting reviewed by the maintainer. In addition to that, you said "mentioned multiple times on bugzilla", hence it'd be good if you add the bugzilla link, so that people understand the history. Peter
diff --git a/./linux-5.14.3/drivers/net/wireless/ath/regd_common.h b/./regd_common.h index c4bd26e..6d8c85d 100644 --- a/./linux-5.14.3/drivers/net/wireless/ath/regd_common.h +++ b/./regd_common.h @@ -76,6 +76,7 @@ enum EnumRd { APL7_FCCA = 0x5C, APL8_WORLD = 0x5D, APL9_WORLD = 0x5E, + APL10_WORLD = 0x5F, WOR0_WORLD = 0x60, WOR1_WORLD = 0x61, @@ -204,6 +205,7 @@ static struct reg_dmn_pair_mapping regDomainPairs[] = { {APL6_WORLD, CTL_ETSI, CTL_ETSI}, {APL8_WORLD, CTL_ETSI, CTL_ETSI}, {APL9_WORLD, CTL_ETSI, CTL_ETSI}, + {APL10_WORLD, CTL_ETSI, CTL_ETSI}, {APL3_FCCA, CTL_FCC, CTL_FCC}, {APL7_FCCA, CTL_FCC, CTL_FCC}, @@ -426,6 +428,7 @@ static struct country_code_to_enum_rd allCountries[] = { {CTRY_KOREA_ROC, APL9_WORLD, "KR"}, {CTRY_KOREA_ROC2, APL2_WORLD, "K2"}, {CTRY_KOREA_ROC3, APL9_WORLD, "K3"}, + {CTRY_KOREA_ROC, APL10_WORLD, "KR"}, {CTRY_KUWAIT, ETSI3_WORLD, "KW"}, {CTRY_LATVIA, ETSI1_WORLD, "LV"}, {CTRY_LEBANON, NULL1_WORLD, "LB"},