diff options
| author | Rafał Miłecki <zajec5@gmail.com> | 2016-09-29 14:25:35 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-09-29 14:26:20 +0200 |
| commit | 396e838bd6a8e8df8ea2f0fdb8b70be449682b8f (patch) | |
| tree | dd936fa09e3b0e36bb8c349261ce656c7915fb5a /package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch | |
| parent | 1016f38a869a77a384b11aac7f6b947ce67726e1 (diff) | |
| download | upstream-396e838bd6a8e8df8ea2f0fdb8b70be449682b8f.tar.gz upstream-396e838bd6a8e8df8ea2f0fdb8b70be449682b8f.tar.bz2 upstream-396e838bd6a8e8df8ea2f0fdb8b70be449682b8f.zip | |
mac80211: brcmfmac: backport patches that were skipped previously #1
They are necessary for further fixes and improvements otherwise recent
patches don't apply.
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 be6606d25a..e80ca8da0e 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 -@@ -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++; |