mac80211: brcmfmac: backport patches that were skipped previously #1

[15.05/openwrt.git] / package / kernel / mac80211 / patches / 351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch

diff --git a/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch b/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
index be6606d..e80ca8d 100644 (file)
--- a/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
+++ b/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
@@ -23,7 +23,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
 
 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
 +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-@@ -6105,29 +6105,15 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6207,29 +6207,15 @@ static int brcmf_setup_ifmodes(struct wi
        if (!combo)
                goto err;
  
@@ -56,7 +56,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        c0_limits[i].max = 1;
        c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
        if (p2p) {
-@@ -6145,6 +6131,7 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6247,6 +6233,7 @@ static int brcmf_setup_ifmodes(struct wi
                c0_limits[i].max = 1;
                c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
        }
@@ -64,7 +64,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
        combo[c].max_interfaces = i;
        combo[c].n_limits = i;
        combo[c].limits = c0_limits;
-@@ -6152,7 +6139,9 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6254,7 +6241,9 @@ static int brcmf_setup_ifmodes(struct wi
        if (p2p) {
                c++;
                i = 0;
@@ -75,7 +75,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                p2p_limits[i].max = 1;
                p2p_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
                p2p_limits[i].max = 1;
-@@ -6161,6 +6150,7 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6263,6 +6252,7 @@ static int brcmf_setup_ifmodes(struct wi
                p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT);
                p2p_limits[i].max = 1;
                p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
@@ -83,7 +83,7 @@ Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
                combo[c].max_interfaces = i;
                combo[c].n_limits = i;
                combo[c].limits = p2p_limits;
-@@ -6168,14 +6158,19 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6270,14 +6260,19 @@ static int brcmf_setup_ifmodes(struct wi
  
        if (mbss) {
                c++;