소스 검색

mac80211: fix quilt patch corruption

Fixes: 9219b0660a91 ("mac80211: fix HE issues with AP_VLAN interfaces")
Signed-off-by: Felix Fietkau <[email protected]>
Felix Fietkau 2 년 전
부모
커밋
f343001b25

+ 0 - 12
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 <[email protected]>
  	for (i = 0; i < sband->n_iftype_data; i++)  {
  	for (i = 0; i < sband->n_iftype_data; i++)  {
  		const struct ieee80211_sband_iftype_data *data =
  		const struct ieee80211_sband_iftype_data *data =
  			&sband->iftype_data[i];
  			&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];

+ 2 - 2
package/kernel/mac80211/patches/subsys/500-mac80211_configure_antenna_gain.patch

@@ -1,6 +1,6 @@
 --- a/include/net/cfg80211.h
 --- a/include/net/cfg80211.h
 +++ b/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.)
   *	(as advertised by the nl80211 feature flag.)
   * @get_tx_power: store the current TX power into the dbm variable;
   * @get_tx_power: store the current TX power into the dbm variable;
   *	return 0 if successful
   *	return 0 if successful
@@ -8,7 +8,7 @@
   *
   *
   * @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
   * @rfkill_poll: polls the hw rfkill line, use cfg80211 reporting
   *	functions to adjust rfkill hw state
   *	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);
  				enum nl80211_tx_power_setting type, int mbm);
  	int	(*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
  	int	(*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
  				int *dbm);
  				int *dbm);