[09/12] patches: Add include in cfg80211.h
diff mbox series

Message ID 20190805120704.13128-10-hauke@hauke-m.de
State New
Headers show
Series
  • backports: Update to kernel 5.3-rc3
Related show

Commit Message

Hauke Mehrtens Aug. 5, 2019, 12:07 p.m. UTC
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 <hauke@hauke-m.de>
---
 .../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

Patch
diff mbox series

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)
  {