aboutsummaryrefslogtreecommitdiffstats
path: root/package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2016-09-29 15:49:20 +0200
committerGitHub <noreply@github.com>2016-09-29 15:49:20 +0200
commitca3f1a614a1ee90fc67188b375888517f0c151df (patch)
tree930c456200793be1ec731e819aa0dd2e4b0b0dbf /package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch
parentd6b3ca24c50047af58135ad3090f7a3a25eee35d (diff)
parentf9755e28776fdce0c2136492b43380d0eefe3c5a (diff)
downloadupstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.gz
upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.tar.bz2
upstream-ca3f1a614a1ee90fc67188b375888517f0c151df.zip
Merge pull request #105 from wigyori/chaos_calmer
CC: openssl security upgrade, sync updates from git.openwrt.org/chaos_calmer
Diffstat (limited to 'package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch')
-rw-r--r--package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch37
1 files changed, 37 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch b/package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch
new file mode 100644
index 0000000000..09547d8d3b
--- /dev/null
+++ b/package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch
@@ -0,0 +1,37 @@
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
+Date: Tue, 7 Jun 2016 08:20:21 +0200
+Subject: [PATCH] brcmfmac: include required headers in cfg80211.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Without this including cfg80211.h in a wrong order could result in:
+
+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:122:24: error: array type has incomplete element type
+ struct brcmf_wsec_key key[BRCMF_MAX_DEFAULT_KEYS];
+ ^
+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:291:24: error: field ‘p2p’ has incomplete type
+ struct brcmf_p2p_info p2p;
+ ^
+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:297:27: error: field ‘pmk_list’ has incomplete type
+ struct brcmf_pmk_list_le pmk_list;
+ ^
+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:317:28: error: field ‘assoclist’ has incomplete type
+ struct brcmf_assoclist_le assoclist;
+
+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
+---
+
+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
+@@ -20,6 +20,9 @@
+ /* for brcmu_d11inf */
+ #include <brcmu_d11.h>
+
++#include "fwil_types.h"
++#include "p2p.h"
++
+ #define WL_NUM_SCAN_MAX 10
+ #define WL_TLV_INFO_MAX 1024
+ #define WL_BSS_INFO_MAX 2048