[PATCH 09/12] patches: Add include in cfg80211.h

Hauke Mehrtens <[email protected]>
Newsgroups org.kernel.vger.backports
Message-ID <[email protected]>
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 <[email protected]>
---
 .../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 <linux/ieee80211.h>
+ #include <linux/net.h>
+ #include <net/regulatory.h>
++#include <net/netlink.h>
+ 
+ /**
+  * 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)
  {
-- 
2.20.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.