mac80211: backport the txq scheduling / airtime fairness API

[openwrt/staging/dedeckeh.git] / package / kernel / mac80211 / patches / subsys / 390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch

diff --git a/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch b/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
index 70670b3ebfd09951e569804e9da45489e4cf83ca..4c5b403dc4b19cefe5e8c0a475af9114de2fee7e 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
+++ b/package/kernel/mac80211/patches/subsys/390-nl-mac-80211-allow-4addr-AP-operation-on-crypto-cont.patch
@@ -38,7 +38,7 @@ Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
 
 --- a/include/net/cfg80211.h
 +++ b/include/net/cfg80211.h
-@@ -3448,7 +3448,8 @@ struct cfg80211_ops {
+@@ -3457,7 +3457,8 @@ struct cfg80211_ops {
   *    on wiphy_new(), but can be changed by the driver if it has a good
   *    reason to override the default
   * @WIPHY_FLAG_4ADDR_AP: supports 4addr mode even on AP (with a single station
@@ -81,7 +81,7 @@ Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
                break;
 --- a/net/wireless/nl80211.c
 +++ b/net/wireless/nl80211.c
-@@ -3193,8 +3193,7 @@ static int nl80211_new_interface(struct
+@@ -3194,8 +3194,7 @@ static int nl80211_new_interface(struct
                        return -EINVAL;
        }
  
@@ -91,7 +91,7 @@ Signed-off-by: Manikanta Pubbisetty <mpubbise@codeaurora.org>
                return -EOPNOTSUPP;
  
        if ((type == NL80211_IFTYPE_P2P_DEVICE || type == NL80211_IFTYPE_NAN ||
-@@ -3213,6 +3212,13 @@ static int nl80211_new_interface(struct
+@@ -3214,6 +3213,13 @@ static int nl80211_new_interface(struct
                        return err;
        }