aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-02-23 13:58:13 +0100
committerFelix Fietkau <nbd@nbd.name>2018-02-23 13:58:36 +0100
commitfb1be20d63f08a07c63bcd5ffb26d010935dfa61 (patch)
treeb6331edce527bd7c92ad4bbacd62e6a08acaeeeb
parent393661640b0ec9e5eec83b44e9084b8df687bc03 (diff)
downloadupstream-fb1be20d63f08a07c63bcd5ffb26d010935dfa61.tar.gz
upstream-fb1be20d63f08a07c63bcd5ffb26d010935dfa61.tar.bz2
upstream-fb1be20d63f08a07c63bcd5ffb26d010935dfa61.zip
mac80211: sync fast-rx patch with updated version
Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/kernel/mac80211/patches/334-mac80211-support-station-4-addr-mode-fast-rx.patch18
-rw-r--r--package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch4
2 files changed, 2 insertions, 20 deletions
diff --git a/package/kernel/mac80211/patches/334-mac80211-support-station-4-addr-mode-fast-rx.patch b/package/kernel/mac80211/patches/334-mac80211-support-station-4-addr-mode-fast-rx.patch
index 8f9cba138f..97a5d8beba 100644
--- a/package/kernel/mac80211/patches/334-mac80211-support-station-4-addr-mode-fast-rx.patch
+++ b/package/kernel/mac80211/patches/334-mac80211-support-station-4-addr-mode-fast-rx.patch
@@ -5,24 +5,6 @@ Subject: [PATCH] mac80211: support station 4-addr mode fast-rx
Signed-off-by: Felix Fietkau <nbd@nbd.name>
---
---- a/net/mac80211/cfg.c
-+++ b/net/mac80211/cfg.c
-@@ -160,7 +160,6 @@ static int ieee80211_change_iface(struct
- if (type == NL80211_IFTYPE_AP_VLAN &&
- params && params->use_4addr == 0) {
- RCU_INIT_POINTER(sdata->u.vlan.sta, NULL);
-- ieee80211_check_fast_rx_iface(sdata);
- } else if (type == NL80211_IFTYPE_STATION &&
- params && params->use_4addr >= 0) {
- sdata->u.mgd.use_4addr = params->use_4addr;
-@@ -1574,7 +1573,6 @@ static int ieee80211_change_station(stru
- }
-
- rcu_assign_pointer(vlansdata->u.vlan.sta, sta);
-- __ieee80211_check_fast_rx_iface(vlansdata);
- }
-
- if (sta->sdata->vif.type == NL80211_IFTYPE_AP_VLAN &&
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -3738,10 +3738,6 @@ void ieee80211_check_fast_rx(struct sta_
diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
index 80723b1c8a..19f0ff2ae9 100644
--- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
+++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
@@ -57,7 +57,7 @@
__NL80211_ATTR_AFTER_LAST,
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
-@@ -2445,6 +2445,19 @@ static int ieee80211_get_tx_power(struct
+@@ -2447,6 +2447,19 @@ static int ieee80211_get_tx_power(struct
return 0;
}
@@ -77,7 +77,7 @@
static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
const u8 *addr)
{
-@@ -3719,6 +3732,7 @@ const struct cfg80211_ops mac80211_confi
+@@ -3721,6 +3734,7 @@ const struct cfg80211_ops mac80211_confi
.set_wiphy_params = ieee80211_set_wiphy_params,
.set_tx_power = ieee80211_set_tx_power,
.get_tx_power = ieee80211_get_tx_power,