mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-26 00:41:17 +00:00
ac5a6acbb1
This updates the backports package used in mac80211 to version 4.19.7-1 which is based on kernel 4.19.7. This integrates all the stable fixes introduces in this kernel version. The deleted patches are not needed any more because they are either included in the upstream Linux kernel 4.19.7 or in backports 4.19.7-1. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
93 lines
2.3 KiB
Diff
93 lines
2.3 KiB
Diff
--- a/drivers/net/wireless/ath/regd.c
|
|
+++ b/drivers/net/wireless/ath/regd.c
|
|
@@ -24,6 +24,7 @@
|
|
#include "regd_common.h"
|
|
|
|
static int __ath_regd_init(struct ath_regulatory *reg);
|
|
+static struct reg_dmn_pair_mapping *ath_get_regpair(int regdmn);
|
|
|
|
/*
|
|
* This is a set of common rules used by our world regulatory domains.
|
|
@@ -116,6 +117,9 @@ static const struct ieee80211_regdomain
|
|
|
|
static bool dynamic_country_user_possible(struct ath_regulatory *reg)
|
|
{
|
|
+ if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
|
|
+ return true;
|
|
+
|
|
if (IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_CERT_TESTING))
|
|
return true;
|
|
|
|
@@ -188,6 +192,8 @@ static bool dynamic_country_user_possibl
|
|
|
|
static bool ath_reg_dyn_country_user_allow(struct ath_regulatory *reg)
|
|
{
|
|
+ if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
|
|
+ return true;
|
|
if (!IS_ENABLED(CPTCFG_ATH_REG_DYNAMIC_USER_REG_HINTS))
|
|
return false;
|
|
if (!dynamic_country_user_possible(reg))
|
|
@@ -345,6 +351,9 @@ ath_reg_apply_beaconing_flags(struct wip
|
|
struct ieee80211_channel *ch;
|
|
unsigned int i;
|
|
|
|
+ if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
|
|
+ return;
|
|
+
|
|
for (band = 0; band < NUM_NL80211_BANDS; band++) {
|
|
if (!wiphy->bands[band])
|
|
continue;
|
|
@@ -378,6 +387,9 @@ ath_reg_apply_ir_flags(struct wiphy *wip
|
|
{
|
|
struct ieee80211_supported_band *sband;
|
|
|
|
+ if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
|
|
+ return;
|
|
+
|
|
sband = wiphy->bands[NL80211_BAND_2GHZ];
|
|
if (!sband)
|
|
return;
|
|
@@ -407,6 +419,9 @@ static void ath_reg_apply_radar_flags(st
|
|
struct ieee80211_channel *ch;
|
|
unsigned int i;
|
|
|
|
+ if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
|
|
+ return;
|
|
+
|
|
if (!wiphy->bands[NL80211_BAND_5GHZ])
|
|
return;
|
|
|
|
@@ -639,6 +654,10 @@ ath_regd_init_wiphy(struct ath_regulator
|
|
const struct ieee80211_regdomain *regd;
|
|
|
|
wiphy->reg_notifier = reg_notifier;
|
|
+
|
|
+ if (IS_ENABLED(CPTCFG_ATH_USER_REGD))
|
|
+ return 0;
|
|
+
|
|
wiphy->regulatory_flags |= REGULATORY_STRICT_REG |
|
|
REGULATORY_CUSTOM_REG;
|
|
|
|
--- a/drivers/net/wireless/ath/Kconfig
|
|
+++ b/drivers/net/wireless/ath/Kconfig
|
|
@@ -23,6 +23,9 @@ config WLAN_VENDOR_ATH
|
|
|
|
if WLAN_VENDOR_ATH
|
|
|
|
+config ATH_USER_REGD
|
|
+ bool "Do not enforce EEPROM regulatory restrictions"
|
|
+
|
|
config ATH_DEBUG
|
|
bool "Atheros wireless debugging"
|
|
---help---
|
|
--- a/local-symbols
|
|
+++ b/local-symbols
|
|
@@ -83,6 +83,7 @@ ADM8211=
|
|
ATH_COMMON=
|
|
WLAN_VENDOR_ATH=
|
|
ATH_DEBUG=
|
|
+ATH_USER_REGD=
|
|
ATH_TRACEPOINTS=
|
|
ATH_REG_DYNAMIC_USER_REG_HINTS=
|
|
ATH_REG_DYNAMIC_USER_CERT_TESTING=
|