From 8d4d173326b4e5fa35e69c9de13ae02283c876a9 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 2 Aug 2019 22:03:56 +0200 Subject: patches: Add include in cfg80211.h cfg80211.h uses struct nla_policy in two places, but does not include net/netlink.h directly. Because of this missing include the rename to struct nla_backport_policy is not applied and this results in type mismatch errors when compiling backports. With this additional include the type is renamed. Signed-off-by: Hauke Mehrtens --- patches/0013-fix-makefile-includes/cfg80211.patch | 16 ++++++++++++++++ patches/0053-possible_net_t.patch | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 patches/0013-fix-makefile-includes/cfg80211.patch diff --git a/patches/0013-fix-makefile-includes/cfg80211.patch b/patches/0013-fix-makefile-includes/cfg80211.patch new file mode 100644 index 00000000..ba4f0825 --- /dev/null +++ b/patches/0013-fix-makefile-includes/cfg80211.patch @@ -0,0 +1,16 @@ +cfg80211.h uses struct nla_policy in two places, but does not include +net/netlink.h directly. Because of this missing include the rename to +struct nla_backport_policy is not applied and this results in type +mismatch errors when compiling backports. With this additional include +the type is renamed. + +--- a/include/net/cfg80211.h ++++ b/include/net/cfg80211.h +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + /** + * DOC: Introduction diff --git a/patches/0053-possible_net_t.patch b/patches/0053-possible_net_t.patch index 4d9f0cfd..06873e3b 100644 --- a/patches/0053-possible_net_t.patch +++ b/patches/0053-possible_net_t.patch @@ -2,7 +2,7 @@ diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 04e5785..a251da1 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -4581,12 +4581,12 @@ struct wiphy { +@@ -4582,12 +4582,12 @@ struct wiphy { static inline struct net *wiphy_net(struct wiphy *wiphy) { -- cgit v1.2.3