mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-06-21 08:08:32 +02:00
0b2c42ced2
This updates mac80211 to version 5.2-rc7, this contains all the changes to the wireless subsystem up to Linux 5.2-rc7. * The removed patches are applied upstream * b43 now uses kmod-lib-cordic * Update the nl80211.h file in iw to match backports version. * Remove the two backports from kernel 4.9, they were needed for mt76, but that can use the version from backports now, otherwise they collide and cause compile errors. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
27 lines
947 B
Diff
27 lines
947 B
Diff
--- a/drivers/net/wireless/ath/regd_common.h
|
|
+++ b/drivers/net/wireless/ath/regd_common.h
|
|
@@ -32,6 +32,7 @@ enum EnumRd {
|
|
FCC2_WORLD = 0x21,
|
|
FCC2_ETSIC = 0x22,
|
|
FCC6_WORLD = 0x23,
|
|
+ FCC3_FCCA_2 = 0x2A,
|
|
FRANCE_RES = 0x31,
|
|
FCC3_FCCA = 0x3A,
|
|
FCC3_WORLD = 0x3B,
|
|
@@ -172,6 +173,7 @@ static struct reg_dmn_pair_mapping regDo
|
|
{FCC2_WORLD, CTL_FCC, CTL_ETSI},
|
|
{FCC2_ETSIC, CTL_FCC, CTL_ETSI},
|
|
{FCC3_FCCA, CTL_FCC, CTL_FCC},
|
|
+ {FCC3_FCCA_2, CTL_FCC, CTL_FCC},
|
|
{FCC3_WORLD, CTL_FCC, CTL_ETSI},
|
|
{FCC3_ETSIC, CTL_FCC, CTL_ETSI},
|
|
{FCC4_FCCA, CTL_FCC, CTL_FCC},
|
|
@@ -483,6 +485,7 @@ static struct country_code_to_enum_rd al
|
|
{CTRY_UAE, NULL1_WORLD, "AE"},
|
|
{CTRY_UNITED_KINGDOM, ETSI1_WORLD, "GB"},
|
|
{CTRY_UNITED_STATES, FCC3_FCCA, "US"},
|
|
+ {CTRY_UNITED_STATES, FCC3_FCCA_2, "US"},
|
|
{CTRY_UNITED_STATES2, FCC3_FCCA, "US"},
|
|
{CTRY_UNITED_STATES3, FCC3_FCCA, "US"},
|
|
/* This "PS" is for US public safety actually... to support this we
|