mac80211: sync fast-rx patch with updated version
authorFelix Fietkau <nbd@nbd.name>
Fri, 23 Feb 2018 12:58:13 +0000 (13:58 +0100)
committerFelix Fietkau <nbd@nbd.name>
Fri, 23 Feb 2018 12:58:36 +0000 (13:58 +0100)
Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/kernel/mac80211/patches/334-mac80211-support-station-4-addr-mode-fast-rx.patch
package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch

index 8f9cba1..97a5d8b 100644 (file)
@@ -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_
index 80723b1..19f0ff2 100644 (file)
@@ -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,