diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-09-29 14:58:53 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-09-29 14:58:53 +0200 |
| commit | bc004132213820368cc3af1e54e18f5cdb760972 (patch) | |
| tree | 499f23dda28368b36385209c3ceb0a5227ab9fad /package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch | |
| parent | 396e838bd6a8e8df8ea2f0fdb8b70be449682b8f (diff) | |
| download | upstream-bc004132213820368cc3af1e54e18f5cdb760972.tar.gz upstream-bc004132213820368cc3af1e54e18f5cdb760972.tar.bz2 upstream-bc004132213820368cc3af1e54e18f5cdb760972.zip | |
mac80211: brcmfmac: backport patches that were skipped previously #2
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
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.patch | 10 |
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 e80ca8da0e..461e3dba53 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 -@@ -6207,29 +6207,15 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6208,29 +6208,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) { -@@ -6247,6 +6233,7 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6248,6 +6234,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; -@@ -6254,7 +6241,9 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6255,7 +6242,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; -@@ -6263,6 +6252,7 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6264,6 +6253,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; -@@ -6270,14 +6260,19 @@ static int brcmf_setup_ifmodes(struct wi +@@ -6271,14 +6261,19 @@ static int brcmf_setup_ifmodes(struct wi if (mbss) { c++; |