aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
diff options
context:
space:
mode:
authorRafał Miłecki <zajec5@gmail.com>2016-09-29 14:24:14 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-09-29 14:24:14 +0200
commit3bf4b214e8a2f4f35b541a6180ac7d5cdd6786fc (patch)
treebdacfab650ab021f24989c8fd9f49af0e1d472ca /package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
parent99ed5200c05be1d8535dae8903cd50a74b47ca37 (diff)
downloadupstream-3bf4b214e8a2f4f35b541a6180ac7d5cdd6786fc.tar.gz
upstream-3bf4b214e8a2f4f35b541a6180ac7d5cdd6786fc.tar.bz2
upstream-3bf4b214e8a2f4f35b541a6180ac7d5cdd6786fc.zip
mac80211: brcmfmac: backport patch simplifying brcmf_alloc_vif
This is quite trivial and will be required for VIF fixes in the future. Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
Diffstat (limited to 'package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch')
-rw-r--r--package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch10
1 files changed, 5 insertions, 5 deletions
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 972851633a..be6606d25a 100644
--- 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
-@@ -6108,29 +6108,15 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6105,29 +6105,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) {
-@@ -6148,6 +6134,7 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6145,6 +6131,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;
-@@ -6155,7 +6142,9 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6152,7 +6139,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;
-@@ -6164,6 +6153,7 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6161,6 +6150,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;
-@@ -6171,14 +6161,19 @@ static int brcmf_setup_ifmodes(struct wi
+@@ -6168,14 +6158,19 @@ static int brcmf_setup_ifmodes(struct wi
if (mbss) {
c++;