summaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/subsys
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2023-06-23 17:33:50 +0200
committerFelix Fietkau <nbd@nbd.name>2023-06-23 17:34:19 +0200
commitf343001b251a8ce080ec770f980ce67f4bd66bca (patch)
tree1772256dfb6d2930433185d1d618121e3d5c7bee /package/kernel/mac80211/patches/subsys
parentb99dd5b8bda2ce8f627326cddb69206abf5742f9 (diff)
downloadopenwrt-f343001b251a8ce080ec770f980ce67f4bd66bca.tar.gz
openwrt-f343001b251a8ce080ec770f980ce67f4bd66bca.tar.bz2
openwrt-f343001b251a8ce080ec770f980ce67f4bd66bca.zip
mac80211: fix quilt patch corruption
Fixes: 9219b0660a91 ("mac80211: fix HE issues with AP_VLAN interfaces") Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys')
-rw-r--r--package/kernel/mac80211/patches/subsys/337-mac80211-fix-sband-iftype-data-lookup-for-AP_VLAN.patch12
-rw-r--r--package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch4
2 files changed, 2 insertions, 14 deletions
diff --git a/package/kernel/mac80211/patches/subsys/337-mac80211-fix-sband-iftype-data-lookup-for-AP_VLAN.patch b/package/kernel/mac80211/patches/subsys/337-mac80211-fix-sband-iftype-data-lookup-for-AP_VLAN.patch
index 9d8b1978b2..67b4284949 100644
--- a/package/kernel/mac80211/patches/subsys/337-mac80211-fix-sband-iftype-data-lookup-for-AP_VLAN.patch
+++ b/package/kernel/mac80211/patches/subsys/337-mac80211-fix-sband-iftype-data-lookup-for-AP_VLAN.patch
@@ -21,15 +21,3 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
for (i = 0; i < sband->n_iftype_data; i++) {
const struct ieee80211_sband_iftype_data *data =
&sband->iftype_data[i];
---- a/include/net/cfg80211.h
-+++ b/include/net/cfg80211.h
-@@ -567,6 +567,9 @@ ieee80211_get_sband_iftype_data(const st
- if (WARN_ON(iftype >= NL80211_IFTYPE_MAX))
- return NULL;
-
-+ if (iftype == NL80211_IFTYPE_AP_VLAN)
-+ iftype = NL80211_IFTYPE_AP;
-+
- for (i = 0; i < sband->n_iftype_data; i++) {
- const struct ieee80211_sband_iftype_data *data =
- &sband->iftype_data[i];
diff --git a/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch
index 7438f4fb88..58a590682a 100644
--- a/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch
@@ -1,6 +1,6 @@
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
-@@ -4087,6 +4087,7 @@ struct mgmt_frame_regs {
+@@ -4084,6 +4084,7 @@ struct mgmt_frame_regs {
* (as advertised by the nl80211 feature flag.)
* @get_tx_power: store the current TX power into the dbm variable;
* return 0 if successful
@@ -8,7 +8,7 @@
*
* @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
* functions to adjust rfkill hw state
-@@ -4437,6 +4438,7 @@ struct cfg80211_ops {
+@@ -4434,6 +4435,7 @@ struct cfg80211_ops {
enum nl80211_tx_power_setting type, int mbm);
int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
int *dbm);