Merge ~vicamo/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:bug-1884634/fix-build-against-oem-5.6/focal into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/focal

[You-Sheng Yang]

* Fix build against v5.8 kernel (LP: #1884634)
  - backport: add genlmsg_parse()
  - backport: update include/uapi/linux/pci_regs.h
  - [NOUPSTREAM] iwlwifi: mvm: use 64-bit version of timespec
  - [NOUPSTREAM] cfg80211: use parallel_ops for genl
  - backports: netlink: fix nla_validate_nested()
  - netlink: rename nl80211_validate_nested() to nla_validate_nested()
  - ftrace: Rework event_create_dir()
  - nl80211: fix NL80211_ATTR_FTM_RESPONDER policy
  - [NOUPSTREAM] nl80211: pull in NLA_POLICY_EXACT_LEN_WARN() usage

[SRU Justifcation]

[Impact]
When compiled against linux-oem-5.6/linux-5.8 kernels on Focal, backport-iwlwifi-dkms gives numerous errors due to in kernel interface changes and fails the installation.

[Fix]
This backports several patches from upstream backport-iwlwifi, mainline kernel, and backports project.

[Test Case]
Tested build on 5.4.0-52-generic, 5.6.0-1032-oem and 5.8.0-25-generic on Focal. Since the current version 8324 has been marked obsoleted by 5.4 or newer in bug 1863583 and bug 1869587, built modules are not installed currently so no runtime tests are required.

[Regression Potential]
Low. So far backport-iwlwifi-dkms is still marked OBSOLETED_BY=5.4.0, so it has totally no effect in the runtime system. This will only change when future enablements based on LTS series Focal that relies on out-of-tree driver support from this package.

[Timo Aaltonen (tjaalton)]

this got uploaded earlier

review: Approve

[You-Sheng Yang (vicamo)]

Was rejected due to too much changes while SRU back to Focal. Redo with cherry-picking necessary patches. Still need some more polishing and tests.

[You-Sheng Yang (vicamo)]

Updated commits to include only necessary changes backported from upstream backport-iwlwifi, mainline kernel, and backports project.

Need review & submit.

[Alberto Milone (albertomilone)]

It looks good to me. Approved, thanks.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index 4aae555..6e485d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+backport-iwlwifi-dkms (8324-0ubuntu3~20.04.2) focal; urgency=medium
+
+  * Fix build against v5.8 kernel (LP: #1884634)
+    - backport: add genlmsg_parse()
+    - backport: update include/uapi/linux/pci_regs.h
+    - [NOUPSTREAM] iwlwifi: mvm: use 64-bit version of timespec
+    - [NOUPSTREAM] cfg80211: use parallel_ops for genl
+    - backports: netlink: fix nla_validate_nested()
+    - netlink: rename nl80211_validate_nested() to nla_validate_nested()
+    - ftrace: Rework event_create_dir()
+    - nl80211: fix NL80211_ATTR_FTM_RESPONDER policy
+    - [NOUPSTREAM] nl80211: pull in NLA_POLICY_EXACT_LEN_WARN() usage
+
+ -- You-Sheng Yang <[e-mail]>  Mon, 02 Nov 2020 13:55:31 +0000
+
 backport-iwlwifi-dkms (8324-0ubuntu3~20.04.1) focal; urgency=medium
 
   * dkms: stop installing kernel on 5.4 or newer (LP: #1863583)
diff --git a/debian/patches/0007-backport-add-genlmsg_parse.patch b/debian/patches/0007-backport-add-genlmsg_parse.patch
 new file mode 100644
index 0000000..c2e385a
--- /dev/null
+++ b/debian/patches/0007-backport-add-genlmsg_parse.patch
@@ -0,0 +1,50 @@
+From dab7f14acb372b1a0c5f0c8b0b256bbc09f2f362 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <[e-mail]>
+Date: Fri, 28 Feb 2020 09:17:40 +0100
+Subject: [PATCH] backport: add genlmsg_parse()
+
+We just need to provide our own version of this so that
+the types match up correctly.
+
+While at it, fix the version ifdef comment.
+
+type=feature
+ticket=none
+
+Change-Id: Ic7f3b6424b5474b73eb2f9819569118e38e1b479
+Signed-off-by: Johannes Berg <[e-mail]>
+Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/254152
+Tested-by: ec ger unix iil jenkins <[e-mail]>
+x-iwlwifi-stack-dev: da7591716aa2f04b80e987362033452f0e2419b6
+(cherry picked from commit f207b0f5e770f7f90d8a19fedc9cb72031dd4322)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ backport-include/net/genetlink.h | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/backport-include/net/genetlink.h b/backport-include/net/genetlink.h
+index e6b78e02a..90ec7a789 100644
+--- a/backport-include/net/genetlink.h
++++ b/backport-include/net/genetlink.h
+@@ -250,6 +250,17 @@ static inline struct nlattr **genl_family_attrbuf(struct genl_family *family)
+ 
+ 	return family->attrbuf;
+ }
+-#endif /* LINUX_VERSION_IS_LESS(4,20,0) */
++
++#define genlmsg_parse LINUX_BACKPORT(genlmsg_parse)
++static inline int genlmsg_parse(const struct nlmsghdr *nlh,
++				const struct genl_family *family,
++				struct nlattr *tb[], int maxtype,
++				const struct nla_policy *policy,
++				struct netlink_ext_ack *extack)
++{
++	return __nlmsg_parse(nlh, family->hdrsize + GENL_HDRLEN, tb, maxtype,
++			     policy, NL_VALIDATE_STRICT, extack);
++}
++#endif /* LINUX_VERSION_IS_LESS(5,2) */
+ 
+ #endif /* __BACKPORT_NET_GENETLINK_H */
+-- 
+2.25.1
+
diff --git a/debian/patches/0008-backport-update-include-uapi-linux-pci_regs.h.patch b/debian/patches/0008-backport-update-include-uapi-linux-pci_regs.h.patch
 new file mode 100644
index 0000000..806f8a3
--- /dev/null
+++ b/debian/patches/0008-backport-update-include-uapi-linux-pci_regs.h.patch
@@ -0,0 +1,108 @@
+From b9ef5cc9944385cafa3c3f9e6bb18be27b3a97f5 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <[e-mail]>
+Date: Wed, 22 Jan 2020 16:11:01 +0100
+Subject: [PATCH] backport: update include/uapi/linux/pci_regs.h
+
+This file is normally copied during backporting, but until
+we update from the auto tree, pull this manually in order
+to be able to compile against recent kernels (5.5-rc) on
+which linux/pci.h requires PCI_STD_NUM_BARS from here.
+
+type=feature
+ticket=none
+
+Change-Id: Ia8c75520ae2f937c75fcc97b760e54fc957a49bf
+Signed-off-by: Johannes Berg <[e-mail]>
+Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/250174
+Tested-by: ec ger unix iil jenkins <[e-mail]>
+Reviewed-by: Luciano Coelho <[e-mail]>
+x-iwlwifi-stack-dev: 86a15998a19c849821c133ac5df17c99c8bf6d2f
+(cherry picked from commit 6d34e47b86a11606452ca0002965af854ea530e1)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ include/uapi/linux/pci_regs.h | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
+index 27164769d..acb7d2bdb 100644
+--- a/include/uapi/linux/pci_regs.h
++++ b/include/uapi/linux/pci_regs.h
+@@ -34,6 +34,7 @@
+  * of which the first 64 bytes are standardized as follows:
+  */
+ #define PCI_STD_HEADER_SIZEOF	64
++#define PCI_STD_NUM_BARS	6	/* Number of standard BARs */
+ #define PCI_VENDOR_ID		0x00	/* 16 bits */
+ #define PCI_DEVICE_ID		0x02	/* 16 bits */
+ #define PCI_COMMAND		0x04	/* 16 bits */
+@@ -528,6 +529,7 @@
+ #define  PCI_EXP_LNKCAP_SLS_5_0GB 0x00000002 /* LNKCAP2 SLS Vector bit 1 */
+ #define  PCI_EXP_LNKCAP_SLS_8_0GB 0x00000003 /* LNKCAP2 SLS Vector bit 2 */
+ #define  PCI_EXP_LNKCAP_SLS_16_0GB 0x00000004 /* LNKCAP2 SLS Vector bit 3 */
++#define  PCI_EXP_LNKCAP_SLS_32_0GB 0x00000005 /* LNKCAP2 SLS Vector bit 4 */
+ #define  PCI_EXP_LNKCAP_MLW	0x000003f0 /* Maximum Link Width */
+ #define  PCI_EXP_LNKCAP_ASPMS	0x00000c00 /* ASPM Support */
+ #define  PCI_EXP_LNKCAP_L0SEL	0x00007000 /* L0s Exit Latency */
+@@ -556,6 +558,7 @@
+ #define  PCI_EXP_LNKSTA_CLS_5_0GB 0x0002 /* Current Link Speed 5.0GT/s */
+ #define  PCI_EXP_LNKSTA_CLS_8_0GB 0x0003 /* Current Link Speed 8.0GT/s */
+ #define  PCI_EXP_LNKSTA_CLS_16_0GB 0x0004 /* Current Link Speed 16.0GT/s */
++#define  PCI_EXP_LNKSTA_CLS_32_0GB 0x0005 /* Current Link Speed 32.0GT/s */
+ #define  PCI_EXP_LNKSTA_NLW	0x03f0	/* Negotiated Link Width */
+ #define  PCI_EXP_LNKSTA_NLW_X1	0x0010	/* Current Link Width x1 */
+ #define  PCI_EXP_LNKSTA_NLW_X2	0x0020	/* Current Link Width x2 */
+@@ -589,6 +592,7 @@
+ #define  PCI_EXP_SLTCTL_CCIE	0x0010	/* Command Completed Interrupt Enable */
+ #define  PCI_EXP_SLTCTL_HPIE	0x0020	/* Hot-Plug Interrupt Enable */
+ #define  PCI_EXP_SLTCTL_AIC	0x00c0	/* Attention Indicator Control */
++#define  PCI_EXP_SLTCTL_ATTN_IND_SHIFT 6      /* Attention Indicator shift */
+ #define  PCI_EXP_SLTCTL_ATTN_IND_ON    0x0040 /* Attention Indicator on */
+ #define  PCI_EXP_SLTCTL_ATTN_IND_BLINK 0x0080 /* Attention Indicator blinking */
+ #define  PCI_EXP_SLTCTL_ATTN_IND_OFF   0x00c0 /* Attention Indicator off */
+@@ -661,6 +665,7 @@
+ #define  PCI_EXP_LNKCAP2_SLS_5_0GB	0x00000004 /* Supported Speed 5GT/s */
+ #define  PCI_EXP_LNKCAP2_SLS_8_0GB	0x00000008 /* Supported Speed 8GT/s */
+ #define  PCI_EXP_LNKCAP2_SLS_16_0GB	0x00000010 /* Supported Speed 16GT/s */
++#define  PCI_EXP_LNKCAP2_SLS_32_0GB	0x00000020 /* Supported Speed 32GT/s */
+ #define  PCI_EXP_LNKCAP2_CROSSLINK	0x00000100 /* Crosslink supported */
+ #define PCI_EXP_LNKCTL2		48	/* Link Control 2 */
+ #define  PCI_EXP_LNKCTL2_TLS		0x000f
+@@ -668,6 +673,9 @@
+ #define  PCI_EXP_LNKCTL2_TLS_5_0GT	0x0002 /* Supported Speed 5GT/s */
+ #define  PCI_EXP_LNKCTL2_TLS_8_0GT	0x0003 /* Supported Speed 8GT/s */
+ #define  PCI_EXP_LNKCTL2_TLS_16_0GT	0x0004 /* Supported Speed 16GT/s */
++#define  PCI_EXP_LNKCTL2_TLS_32_0GT	0x0005 /* Supported Speed 32GT/s */
++#define  PCI_EXP_LNKCTL2_ENTER_COMP	0x0010 /* Enter Compliance */
++#define  PCI_EXP_LNKCTL2_TX_MARGIN	0x0380 /* Transmit Margin */
+ #define PCI_EXP_LNKSTA2		50	/* Link Status 2 */
+ #define PCI_CAP_EXP_ENDPOINT_SIZEOF_V2	52	/* v2 endpoints with link end here */
+ #define PCI_EXP_SLTCAP2		52	/* Slot Capabilities 2 */
+@@ -709,7 +717,9 @@
+ #define PCI_EXT_CAP_ID_DPC	0x1D	/* Downstream Port Containment */
+ #define PCI_EXT_CAP_ID_L1SS	0x1E	/* L1 PM Substates */
+ #define PCI_EXT_CAP_ID_PTM	0x1F	/* Precision Time Measurement */
+-#define PCI_EXT_CAP_ID_MAX	PCI_EXT_CAP_ID_PTM
++#define PCI_EXT_CAP_ID_DLF	0x25	/* Data Link Feature */
++#define PCI_EXT_CAP_ID_PL_16GT	0x26	/* Physical Layer 16.0 GT/s */
++#define PCI_EXT_CAP_ID_MAX	PCI_EXT_CAP_ID_PL_16GT
+ 
+ #define PCI_EXT_CAP_DSN_SIZEOF	12
+ #define PCI_EXT_CAP_MCAST_ENDPOINT_SIZEOF 40
+@@ -1049,4 +1059,14 @@
+ #define  PCI_L1SS_CTL1_LTR_L12_TH_SCALE	0xe0000000  /* LTR_L1.2_THRESHOLD_Scale */
+ #define PCI_L1SS_CTL2		0x0c	/* Control 2 Register */
+ 
++/* Data Link Feature */
++#define PCI_DLF_CAP		0x04	/* Capabilities Register */
++#define  PCI_DLF_EXCHANGE_ENABLE	0x80000000  /* Data Link Feature Exchange Enable */
++
++/* Physical Layer 16.0 GT/s */
++#define PCI_PL_16GT_LE_CTRL	0x20	/* Lane Equalization Control Register */
++#define  PCI_PL_16GT_LE_CTRL_DSP_TX_PRESET_MASK		0x0000000F
++#define  PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_MASK		0x000000F0
++#define  PCI_PL_16GT_LE_CTRL_USP_TX_PRESET_SHIFT	4
++
+ #endif /* LINUX_PCI_REGS_H */
+-- 
+2.25.1
+
diff --git a/debian/patches/0009-NOUPSTREAM-iwlwifi-mvm-use-64-bit-version-of-timespe.patch b/debian/patches/0009-NOUPSTREAM-iwlwifi-mvm-use-64-bit-version-of-timespe.patch
 new file mode 100644
index 0000000..10bc138
--- /dev/null
+++ b/debian/patches/0009-NOUPSTREAM-iwlwifi-mvm-use-64-bit-version-of-timespe.patch
@@ -0,0 +1,49 @@
+From 4c7a42b261a102267e50240f0f5c55d2737f0cd2 Mon Sep 17 00:00:00 2001
+From: Luca Coelho <[e-mail]>
+Date: Fri, 27 Mar 2020 10:22:08 +0200
+Subject: [PATCH] [NOUPSTREAM] iwlwifi: mvm: use 64-bit version of timespec
+
+The getnstimeofday() function was removed in v5.4, being replaced by a
+truly 64-bit version.  Replace our only non-upstream usage of
+getnstimeofday() with the new ktime_get_real_s64() function.
+
+type=maint
+ticket=none
+
+Change-Id: I4643aeebe79f1f48b27eab1c1edeb1d7f396f4cb
+Signed-off-by: Luca Coelho <[e-mail]>
+Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/257132
+automatic-review: ec ger unix iil jenkins <[e-mail]>
+Tested-by: ec ger unix iil jenkins <[e-mail]>
+x-iwlwifi-stack-dev: 6651bda5fd07ca61729d3075acf13f655fc40690
+(cherry picked from commit a68daa3747f0b0643de3207cb597ffc501c510cd)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+index 43430589d..1941c86da 100644
+--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
++++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+@@ -5171,7 +5171,7 @@ static void iwl_mvm_event_bar_rx_callback(struct iwl_mvm *mvm,
+ static u32 iwl_mvm_send_latency_marker_cmd(struct iwl_mvm *mvm, u32 msrmnt,
+ 					   u16 seq, u16 tid)
+ {
+-	struct timespec ts;
++	struct timespec64 ts;
+ 	int ret;
+ 	struct iwl_mvm_marker_rsp *rsp;
+ 	struct iwl_mvm_marker *marker;
+@@ -5182,7 +5182,7 @@ static u32 iwl_mvm_send_latency_marker_cmd(struct iwl_mvm *mvm, u32 msrmnt,
+ 	u32 cmd_size = sizeof(struct iwl_mvm_marker) +
+ 		MARKER_CMD_TX_LAT_PAYLOAD_SIZE * sizeof(u32);
+ 
+-	getnstimeofday(&ts);
++	ktime_get_real_ts64(&ts);
+ 
+ 	marker = kzalloc(cmd_size, GFP_KERNEL);
+ 	if (!marker)
+-- 
+2.25.1
+
diff --git a/debian/patches/0010-NOUPSTREAM-cfg80211-use-parallel_ops-for-genl.patch b/debian/patches/0010-NOUPSTREAM-cfg80211-use-parallel_ops-for-genl.patch
 new file mode 100644
index 0000000..da0d5fe
--- /dev/null
+++ b/debian/patches/0010-NOUPSTREAM-cfg80211-use-parallel_ops-for-genl.patch
@@ -0,0 +1,282 @@
+From 145f1fcee90302f44989aaef2486e4166525b09a Mon Sep 17 00:00:00 2001
+From: Johannes Berg <[e-mail]>
+Date: Mon, 29 Jul 2019 16:31:09 +0200
+Subject: [PATCH] [NOUPSTREAM] cfg80211: use parallel_ops for genl
+
+(Imported from upstream commit 50508d941c18 since newer kernels
+remove genl_family_attrbuf() entirely, so we can compile there)
+
+Over time, we really need to get rid of all of our global locking.
+One of the things needed is to use parallel_ops. This isn't really
+the most important (RTNL is much more important) but OTOH we just
+keep adding uses of genl_family_attrbuf() now. Use .parallel_ops to
+disallow this.
+
+type=feature
+ticket=none
+
+Reviewed-By: Denis Kenzior <[e-mail]>
+Link: https://lore.kernel.org/r/[e-mail]
+Change-Id: I351cc0de9d6b6d5f5a14aaf4106ef502ee1b3840
+Signed-off-by: Johannes Berg <[e-mail]>
+Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/250173
+Tested-by: ec ger unix iil jenkins <[e-mail]>
+Reviewed-by: Luciano Coelho <[e-mail]>
+x-iwlwifi-stack-dev: b2d6da5d545c1525b3c73cc3bfaeafbcc770ed15
+(cherry picked from commit 6360027e3331a93d32b259010e5f37d270f6513a)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ net/wireless/nl80211.c | 108 +++++++++++++++++++++++++++++------------
+ 1 file changed, 78 insertions(+), 30 deletions(-)
+
+diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
+index fa70b33ee..d8480b6b1 100644
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -795,17 +795,25 @@ int nl80211_prepare_wdev_dump(struct netlink_callback *cb,
+ 	int err;
+ 
+ 	if (!cb->args[0]) {
++		struct nlattr **attrbuf;
++
++		attrbuf = kcalloc(NUM_NL80211_ATTR, sizeof(*attrbuf),
++				  GFP_KERNEL);
++		if (!attrbuf)
++			return -ENOMEM;
++
+ 		err = nlmsg_parse_deprecated(cb->nlh,
+ 					     GENL_HDRLEN + nl80211_fam.hdrsize,
+-					     genl_family_attrbuf(&nl80211_fam),
+-					     nl80211_fam.maxattr,
++					     attrbuf, nl80211_fam.maxattr,
+ 					     nl80211_policy, NULL);
+-		if (err)
++		if (err) {
++			kfree(attrbuf);
+ 			return err;
++		}
+ 
+-		*wdev = __cfg80211_wdev_from_attrs(
+-					sock_net(cb->skb->sk),
+-					genl_family_attrbuf(&nl80211_fam));
++		*wdev = __cfg80211_wdev_from_attrs(sock_net(cb->skb->sk),
++						   attrbuf);
++		kfree(attrbuf);
+ 		if (IS_ERR(*wdev))
+ 			return PTR_ERR(*wdev);
+ 		*rdev = wiphy_to_rdev((*wdev)->wiphy);
+@@ -2429,14 +2437,21 @@ static int nl80211_dump_wiphy_parse(struct sk_buff *skb,
+ 				    struct netlink_callback *cb,
+ 				    struct nl80211_dump_wiphy_state *state)
+ {
+-	struct nlattr **tb = genl_family_attrbuf(&nl80211_fam);
+-	int ret = nlmsg_parse_deprecated(cb->nlh,
+-					 GENL_HDRLEN + nl80211_fam.hdrsize,
+-					 tb, nl80211_fam.maxattr,
+-					 nl80211_policy, NULL);
++	struct nlattr **tb = kcalloc(NUM_NL80211_ATTR, sizeof(*tb), GFP_KERNEL);
++	int ret;
++
++	if (!tb)
++		return -ENOMEM;
++
++	ret = nlmsg_parse_deprecated(cb->nlh,
++				     GENL_HDRLEN + nl80211_fam.hdrsize,
++				     tb, nl80211_fam.maxattr,
++				     nl80211_policy, NULL);
+ 	/* ignore parse errors for backward compatibility */
+-	if (ret)
+-		return 0;
++	if (ret) {
++		ret = 0;
++		goto out;
++	}
+ 
+ 	state->split = tb[NL80211_ATTR_SPLIT_WIPHY_DUMP];
+ 	if (tb[NL80211_ATTR_WIPHY])
+@@ -2449,8 +2464,10 @@ static int nl80211_dump_wiphy_parse(struct sk_buff *skb,
+ 		int ifidx = nla_get_u32(tb[NL80211_ATTR_IFINDEX]);
+ 
+ 		netdev = __dev_get_by_index(sock_net(skb->sk), ifidx);
+-		if (!netdev)
+-			return -ENODEV;
++		if (!netdev) {
++			ret = -ENODEV;
++			goto out;
++		}
+ 		if (netdev->ieee80211_ptr) {
+ 			rdev = wiphy_to_rdev(
+ 				netdev->ieee80211_ptr->wiphy);
+@@ -2458,7 +2475,10 @@ static int nl80211_dump_wiphy_parse(struct sk_buff *skb,
+ 		}
+ 	}
+ 
+-	return 0;
++	ret = 0;
++out:
++	kfree(tb);
++	return ret;
+ }
+ 
+ static int nl80211_dump_wiphy(struct sk_buff *skb, struct netlink_callback *cb)
+@@ -8774,7 +8794,7 @@ static int nl80211_send_survey(struct sk_buff *msg, u32 portid, u32 seq,
+ 
+ static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)
+ {
+-	struct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam);
++	struct nlattr **attrbuf;
+ 	struct survey_info survey;
+ 	struct cfg80211_registered_device *rdev;
+ 	struct wireless_dev *wdev;
+@@ -8782,6 +8802,10 @@ static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)
+ 	int res;
+ 	bool radio_stats;
+ 
++	attrbuf = kcalloc(NUM_NL80211_ATTR, sizeof(*attrbuf), GFP_KERNEL);
++	if (!attrbuf)
++		return -ENOMEM;
++
+ 	rtnl_lock();
+ 	res = nl80211_prepare_wdev_dump(cb, &rdev, &wdev);
+ 	if (res)
+@@ -8826,6 +8850,7 @@ static int nl80211_dump_survey(struct sk_buff *skb, struct netlink_callback *cb)
+ 	cb->args[2] = survey_idx;
+ 	res = skb->len;
+  out_err:
++	kfree(attrbuf);
+ 	rtnl_unlock();
+ 	return res;
+ }
+@@ -9690,6 +9715,7 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
+ 				 struct netlink_callback *cb)
+ {
+ 	struct cfg80211_registered_device *rdev;
++	struct nlattr **attrbuf = NULL;
+ 	int err;
+ 	long phy_idx;
+ 	void *data = NULL;
+@@ -9710,7 +9736,12 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
+ 			goto out_err;
+ 		}
+ 	} else {
+-		struct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam);
++		attrbuf = kcalloc(NUM_NL80211_ATTR, sizeof(*attrbuf),
++				  GFP_KERNEL);
++		if (!attrbuf) {
++			err = -ENOMEM;
++			goto out_err;
++		}
+ 
+ 		err = nlmsg_parse_deprecated(cb->nlh,
+ 					     GENL_HDRLEN + nl80211_fam.hdrsize,
+@@ -9777,6 +9808,7 @@ static int nl80211_testmode_dump(struct sk_buff *skb,
+ 	/* see above */
+ 	cb->args[0] = phy_idx + 1;
+  out_err:
++	kfree(attrbuf);
+ 	rtnl_unlock();
+ 	return err;
+ }
+@@ -13140,7 +13172,7 @@ static int nl80211_prepare_vendor_dump(struct sk_buff *skb,
+ 				       struct cfg80211_registered_device **rdev,
+ 				       struct wireless_dev **wdev)
+ {
+-	struct nlattr **attrbuf = genl_family_attrbuf(&nl80211_fam);
++	struct nlattr **attrbuf;
+ 	u32 vid, subcmd;
+ 	unsigned int i;
+ 	int vcmd_idx = -1;
+@@ -13171,24 +13203,32 @@ static int nl80211_prepare_vendor_dump(struct sk_buff *skb,
+ 		return 0;
+ 	}
+ 
++	attrbuf = kcalloc(NUM_NL80211_ATTR, sizeof(*attrbuf), GFP_KERNEL);
++	if (!attrbuf)
++		return -ENOMEM;
++
+ 	err = nlmsg_parse_deprecated(cb->nlh,
+ 				     GENL_HDRLEN + nl80211_fam.hdrsize,
+ 				     attrbuf, nl80211_fam.maxattr,
+ 				     nl80211_policy, NULL);
+ 	if (err)
+-		return err;
++		goto out;
+ 
+ 	if (!attrbuf[NL80211_ATTR_VENDOR_ID] ||
+-	    !attrbuf[NL80211_ATTR_VENDOR_SUBCMD])
+-		return -EINVAL;
++	    !attrbuf[NL80211_ATTR_VENDOR_SUBCMD]) {
++		err = -EINVAL;
++		goto out;
++	}
+ 
+ 	*wdev = __cfg80211_wdev_from_attrs(sock_net(skb->sk), attrbuf);
+ 	if (IS_ERR(*wdev))
+ 		*wdev = NULL;
+ 
+ 	*rdev = __cfg80211_rdev_from_attrs(sock_net(skb->sk), attrbuf);
+-	if (IS_ERR(*rdev))
+-		return PTR_ERR(*rdev);
++	if (IS_ERR(*rdev)) {
++		err = PTR_ERR(*rdev);
++		goto out;
++	}
+ 
+ 	vid = nla_get_u32(attrbuf[NL80211_ATTR_VENDOR_ID]);
+ 	subcmd = nla_get_u32(attrbuf[NL80211_ATTR_VENDOR_SUBCMD]);
+@@ -13201,15 +13241,19 @@ static int nl80211_prepare_vendor_dump(struct sk_buff *skb,
+ 		if (vcmd->info.vendor_id != vid || vcmd->info.subcmd != subcmd)
+ 			continue;
+ 
+-		if (!vcmd->dumpit)
+-			return -EOPNOTSUPP;
++		if (!vcmd->dumpit) {
++			err = -EOPNOTSUPP;
++			goto out;
++		}
+ 
+ 		vcmd_idx = i;
+ 		break;
+ 	}
+ 
+-	if (vcmd_idx < 0)
+-		return -EOPNOTSUPP;
++	if (vcmd_idx < 0) {
++		err = -EOPNOTSUPP;
++		goto out;
++	}
+ 
+ 	if (attrbuf[NL80211_ATTR_VENDOR_DATA]) {
+ 		data = nla_data(attrbuf[NL80211_ATTR_VENDOR_DATA]);
+@@ -13220,7 +13264,7 @@ static int nl80211_prepare_vendor_dump(struct sk_buff *skb,
+ 				attrbuf[NL80211_ATTR_VENDOR_DATA],
+ 				genl_callback_extack(cb));
+ 		if (err)
+-			return err;
++			goto out;
+ 	}
+ 
+ 	/* 0 is the first index - add 1 to parse only once */
+@@ -13232,7 +13276,10 @@ static int nl80211_prepare_vendor_dump(struct sk_buff *skb,
+ 	cb->args[4] = data_len;
+ 
+ 	/* keep rtnl locked in successful case */
+-	return 0;
++	err = 0;
++out:
++	kfree(attrbuf);
++	return err;
+ }
+ 
+ static int nl80211_vendor_cmd_dump(struct sk_buff *skb,
+@@ -14927,6 +14974,7 @@ static struct genl_family nl80211_fam __genl_ro_after_init = {
+ 	.n_ops = ARRAY_SIZE(nl80211_ops),
+ 	.mcgrps = nl80211_mcgrps,
+ 	.n_mcgrps = ARRAY_SIZE(nl80211_mcgrps),
++	.parallel_ops = true,
+ };
+ 
+ /* notification functions */
+-- 
+2.25.1
+
diff --git a/debian/patches/0011-backports-netlink-fix-nla_validate_nested.patch b/debian/patches/0011-backports-netlink-fix-nla_validate_nested.patch
 new file mode 100644
index 0000000..011f8da
--- /dev/null
+++ b/debian/patches/0011-backports-netlink-fix-nla_validate_nested.patch
@@ -0,0 +1,43 @@
+From: Johannes Berg <[e-mail]>
+Date: Thu, 12 Mar 2020 16:59:13 +0100
+Subject: backports: netlink: fix nla_validate_nested()
+
+I had accidentally named this nl80211_validate_nested(),
+and it got renamed in 5.6.
+
+Signed-off-by: Johannes Berg <[e-mail]>
+(cherry picked from commit f1708ac5643a1decf36ca92ba0644397df5da1f9
+https://git.kernel.org/pub/scm/linux/kernel/git/backports/backports.git)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ backport-include/net/netlink.h | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/backport-include/net/netlink.h b/backport-include/net/netlink.h
+index 9a5c270..942217e 100644
+--- a/backport-include/net/netlink.h
++++ b/backport-include/net/netlink.h
+@@ -266,17 +266,17 @@ nla_validate_nested_deprecated(const struct nlattr *start, int maxtype,
+ }
+ #endif /* < 5.2 */
+ 
+-#if LINUX_VERSION_IS_LESS(5,3,0)
+-#define nl80211_validate_nested LINUX_BACKPORT(nl80211_validate_nested)
++#if LINUX_VERSION_IS_LESS(5,6,0)
++#define nla_validate_nested LINUX_BACKPORT(nla_validate_nested)
+ static inline int
+-nl80211_validate_nested(const struct nlattr *start, int maxtype,
+-			const struct nla_policy *policy,
+-			struct netlink_ext_ack *extack)
++nla_validate_nested(const struct nlattr *start, int maxtype,
++		    const struct nla_policy *policy,
++		    struct netlink_ext_ack *extack)
+ {
+ 	return __nla_validate_nested(start, maxtype, policy,
+ 				     NL_VALIDATE_STRICT, extack);
+ }
+-#endif /* < 5.3 */
++#endif /* < 5.6 */
+ 
+ #if LINUX_VERSION_IS_LESS(5,1,0)
+ #undef NLA_POLICY_NESTED
diff --git a/debian/patches/0012-netlink-rename-nl80211_validate_nested-to-nla_valida.patch b/debian/patches/0012-netlink-rename-nl80211_validate_nested-to-nla_valida.patch
 new file mode 100644
index 0000000..6de3bcf
--- /dev/null
+++ b/debian/patches/0012-netlink-rename-nl80211_validate_nested-to-nla_valida.patch
@@ -0,0 +1,34 @@
+From: Michal Kubecek <[e-mail]>
+Date: Wed, 11 Dec 2019 10:58:19 +0100
+Subject: netlink: rename nl80211_validate_nested() to nla_validate_nested()
+
+Function nl80211_validate_nested() is not specific to nl80211, it's
+a counterpart to nla_validate_nested_deprecated() with strict validation.
+For consistency with other validation and parse functions, rename it to
+nla_validate_nested().
+
+Signed-off-by: Michal Kubecek <[e-mail]>
+Acked-by: Jiri Pirko <[e-mail]>
+Reviewed-by: Johannes Berg <[e-mail]>
+Signed-off-by: David S. Miller <[e-mail]>
+(backported from commit 32d5109a9d864aea3981f0b5ea736eee4e11b42a
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ net/wireless/nl80211.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
+index d8480b6..702a269 100644
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -13088,8 +13088,7 @@ static int nl80211_vendor_check_policy(const struct wiphy_vendor_command *vcmd,
+ 		return -EINVAL;
+ 	}
+ 
+-	return nl80211_validate_nested(attr, vcmd->maxattr, vcmd->policy,
+-				       extack);
++	return nla_validate_nested(attr, vcmd->maxattr, vcmd->policy, extack);
+ }
+ 
+ static int nl80211_vendor_cmd(struct sk_buff *skb, struct genl_info *info)
diff --git a/debian/patches/0013-ftrace-Rework-event_create_dir.patch b/debian/patches/0013-ftrace-Rework-event_create_dir.patch
 new file mode 100644
index 0000000..4d42878
--- /dev/null
+++ b/debian/patches/0013-ftrace-Rework-event_create_dir.patch
@@ -0,0 +1,125 @@
+From f992b8d650c313c7788f287583c323531244abc7 Mon Sep 17 00:00:00 2001
+From: Peter Zijlstra <[e-mail]>
+Date: Thu, 24 Oct 2019 22:26:59 +0200
+Subject: [PATCH] ftrace: Rework event_create_dir()
+
+Rework event_create_dir() to use an array of static data instead of
+function pointers where possible.
+
+The problem is that it would call the function pointer on module load
+before parse_args(), possibly even before jump_labels were initialized.
+Luckily the generated functions don't use jump_labels but it still seems
+fragile. It also gets in the way of changing when we make the module map
+executable.
+
+The generated function are basically calling trace_define_field() with a
+bunch of static arguments. So instead of a function, capture these
+arguments in a static array, avoiding the function call.
+
+Now there are a number of cases where the fields are dynamic (syscall
+arguments, kprobes and uprobes), in which case a static array does not
+work, for these we preserve the function call. Luckily all these cases
+are not related to modules and so we can retain the function call for
+them.
+
+Also fix up all broken tracepoint definitions that now generate a
+compile error.
+
+Tested-by: Alexei Starovoitov <[e-mail]>
+Tested-by: Steven Rostedt (VMware) <[e-mail]>
+Signed-off-by: Peter Zijlstra (Intel) <[e-mail]>
+Reviewed-by: Steven Rostedt (VMware) <[e-mail]>
+Acked-by: Alexei Starovoitov <[e-mail]>
+Cc: Andy Lutomirski <[e-mail]>
+Cc: Borislav Petkov <[e-mail]>
+Cc: Brian Gerst <[e-mail]>
+Cc: Denys Vlasenko <[e-mail]>
+Cc: H. Peter Anvin <[e-mail]>
+Cc: Linus Torvalds <[e-mail]>
+Cc: Peter Zijlstra <[e-mail]>
+Cc: Steven Rostedt <[e-mail]>
+Cc: Thomas Gleixner <[e-mail]>
+Link: https://lkml.kernel.org/r/[e-mail]
+Signed-off-by: Ingo Molnar <[e-mail]>
+(backported from commit 04ae87a52074e2d448fc66143f1bd2c7d694d2b9
+https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ net/mac80211/trace.h | 28 ++++++++++++++--------------
+ net/wireless/trace.h |  4 ++--
+ 2 files changed, 16 insertions(+), 16 deletions(-)
+
+diff --git a/net/mac80211/trace.h b/net/mac80211/trace.h
+index 009578490..9f034a3c2 100644
+--- a/net/mac80211/trace.h
++++ b/net/mac80211/trace.h
+@@ -408,20 +408,20 @@ TRACE_EVENT(drv_bss_info_changed,
+ 		__field(u32, basic_rates)
+ 		__array(int, mcast_rate, NUM_NL80211_BANDS)
+ 		__field(u16, ht_operation_mode)
+-		__field(s32, cqm_rssi_thold);
+-		__field(s32, cqm_rssi_hyst);
+-		__field(u32, channel_width);
+-		__field(u32, channel_cfreq1);
++		__field(s32, cqm_rssi_thold)
++		__field(s32, cqm_rssi_hyst)
++		__field(u32, channel_width)
++		__field(u32, channel_cfreq1)
+ 		__dynamic_array(u32, arp_addr_list,
+ 				info->arp_addr_cnt > IEEE80211_BSS_ARP_ADDR_LIST_LEN ?
+ 					IEEE80211_BSS_ARP_ADDR_LIST_LEN :
+-					info->arp_addr_cnt);
+-		__field(int, arp_addr_cnt);
+-		__field(bool, qos);
+-		__field(bool, idle);
+-		__field(bool, ps);
+-		__dynamic_array(u8, ssid, info->ssid_len);
+-		__field(bool, hidden_ssid);
++					info->arp_addr_cnt)
++		__field(int, arp_addr_cnt)
++		__field(bool, qos)
++		__field(bool, idle)
++		__field(bool, ps)
++		__dynamic_array(u8, ssid, info->ssid_len)
++		__field(bool, hidden_ssid)
+ 		__field(int, txpower)
+ 		__field(u8, p2p_oppps_ctwindow)
+ 	),
+@@ -1672,8 +1672,8 @@ TRACE_EVENT(drv_start_ap,
+ 		VIF_ENTRY
+ 		__field(u8, dtimper)
+ 		__field(u16, bcnint)
+-		__dynamic_array(u8, ssid, info->ssid_len);
+-		__field(bool, hidden_ssid);
++		__dynamic_array(u8, ssid, info->ssid_len)
++		__field(bool, hidden_ssid)
+ 	),
+ 
+ 	TP_fast_assign(
+@@ -1739,7 +1739,7 @@ TRACE_EVENT(drv_join_ibss,
+ 		VIF_ENTRY
+ 		__field(u8, dtimper)
+ 		__field(u16, bcnint)
+-		__dynamic_array(u8, ssid, info->ssid_len);
++		__dynamic_array(u8, ssid, info->ssid_len)
+ 	),
+ 
+ 	TP_fast_assign(
+diff --git a/net/wireless/trace.h b/net/wireless/trace.h
+index 896b73dc8..3aa5f116e 100644
+--- a/net/wireless/trace.h
++++ b/net/wireless/trace.h
+@@ -2051,8 +2051,8 @@ TRACE_EVENT(rdev_nan_change_conf,
+ 		WIPHY_ENTRY
+ 		WDEV_ENTRY
+ 		__field(u8, master_pref)
+-		__field(u8, bands);
+-		__field(u32, changes);
++		__field(u8, bands)
++		__field(u32, changes)
+ 	),
+ 	TP_fast_assign(
+ 		WIPHY_ASSIGN;
+-- 
+2.27.0
+
diff --git a/debian/patches/0014-nl80211-fix-NL80211_ATTR_FTM_RESPONDER-policy.patch b/debian/patches/0014-nl80211-fix-NL80211_ATTR_FTM_RESPONDER-policy.patch
 new file mode 100644
index 0000000..1b022ef
--- /dev/null
+++ b/debian/patches/0014-nl80211-fix-NL80211_ATTR_FTM_RESPONDER-policy.patch
@@ -0,0 +1,39 @@
+From c3ed40441774defdec1a38256ef6dae75b5a7a11 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <[e-mail]>
+Date: Sun, 12 Apr 2020 00:40:30 +0200
+Subject: [PATCH] nl80211: fix NL80211_ATTR_FTM_RESPONDER policy
+
+The nested policy here should be established using the
+NLA_POLICY_NESTED() macro so the length is properly
+filled in.
+
+Cc: [e-mail]
+Fixes: 81e54d08d9d8 ("cfg80211: support FTM responder configuration/statistics")
+Link: https://lore.kernel.org/r/20200412004029.9d0722bb56c8.Ie690bfcc4a1a61ff8d8ca7e475d59fcaa52fb2da@changeid
+Signed-off-by: Johannes Berg <[e-mail]>
+(cherry-picked from commit 0e012b4e4b5ec8e064be3502382579dd0bb43269)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ net/wireless/nl80211.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
+index fa70b33ee..1c988c10f 100644
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -598,10 +598,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 	[NL80211_ATTR_HE_CAPABILITY] = { .type = NLA_BINARY,
+ 					 .len = NL80211_HE_MAX_CAPABILITY_LEN },
+ 
+-	[NL80211_ATTR_FTM_RESPONDER] = {
+-		.type = NLA_NESTED,
+-		.validation_data = nl80211_ftm_responder_policy,
+-	},
++	[NL80211_ATTR_FTM_RESPONDER] =
++		NLA_POLICY_NESTED(nl80211_ftm_responder_policy),
+ 	[NL80211_ATTR_TIMEOUT] = NLA_POLICY_MIN(NLA_U32, 1),
+ 	[NL80211_ATTR_PEER_MEASUREMENTS] =
+ 		NLA_POLICY_NESTED(nl80211_pmsr_attr_policy),
+-- 
+2.25.1
+
diff --git a/debian/patches/0015-NOUPSTREAM-nl80211-pull-in-NLA_POLICY_EXACT_LEN_WARN.patch b/debian/patches/0015-NOUPSTREAM-nl80211-pull-in-NLA_POLICY_EXACT_LEN_WARN.patch
 new file mode 100644
index 0000000..13c6281
--- /dev/null
+++ b/debian/patches/0015-NOUPSTREAM-nl80211-pull-in-NLA_POLICY_EXACT_LEN_WARN.patch
@@ -0,0 +1,211 @@
+From 580b5af2262d5f55ffaeb9b8f265e08b193aa411 Mon Sep 17 00:00:00 2001
+From: Johannes Berg <[e-mail]>
+Date: Tue, 4 Aug 2020 10:25:29 +0200
+Subject: [PATCH] [NOUPSTREAM] nl80211: pull in NLA_POLICY_EXACT_LEN_WARN()
+ usage
+
+Pull in the usage of NLA_POLICY_EXACT_LEN_WARN() to get things
+to work on kernel 5.8 for now, until we finish the merge from
+there.
+
+type=feature
+ticket=none
+
+Change-Id: I86daa00338d40d7770451b327c7e8b9599912cda
+Signed-off-by: Johannes Berg <[e-mail]>
+Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/272290
+Reviewed-by: Ben Ami, Golan <[e-mail]>
+Reviewed-by: Luciano Coelho <[e-mail]>
+Tested-by: ec ger unix iil jenkins <[e-mail]>
+x-iwlwifi-stack-dev: dd1553ab7e2f1e05780a2f6ecfd7a1d0a0d62fa1
+(backported from commit 132470a283b85d0662206171151967b37fae330b)
+Signed-off-by: You-Sheng Yang <[e-mail]>
+---
+ net/wireless/nl80211.c | 81 ++++++++++--------------------------------
+ 1 file changed, 18 insertions(+), 63 deletions(-)
+
+diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
+index fa70b33ee..589036d2d 100644
+--- a/net/wireless/nl80211.c
++++ b/net/wireless/nl80211.c
+@@ -339,11 +339,8 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 	[NL80211_ATTR_IFINDEX] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_IFNAME] = { .type = NLA_NUL_STRING, .len = IFNAMSIZ-1 },
+ 
+-	[NL80211_ATTR_MAC] = { .type = NLA_EXACT_LEN_WARN, .len = ETH_ALEN },
+-	[NL80211_ATTR_PREV_BSSID] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = ETH_ALEN
+-	},
++	[NL80211_ATTR_MAC] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
++	[NL80211_ATTR_PREV_BSSID] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
+ 
+ 	[NL80211_ATTR_KEY] = { .type = NLA_NESTED, },
+ 	[NL80211_ATTR_KEY_DATA] = { .type = NLA_BINARY,
+@@ -395,10 +392,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 	[NL80211_ATTR_MESH_CONFIG] = { .type = NLA_NESTED },
+ 	[NL80211_ATTR_SUPPORT_MESH_AUTH] = { .type = NLA_FLAG },
+ 
+-	[NL80211_ATTR_HT_CAPABILITY] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = NL80211_HT_CAPABILITY_LEN
+-	},
++	[NL80211_ATTR_HT_CAPABILITY] = NLA_POLICY_EXACT_LEN_WARN(NL80211_HT_CAPABILITY_LEN),
+ 
+ 	[NL80211_ATTR_MGMT_SUBTYPE] = { .type = NLA_U8 },
+ 	[NL80211_ATTR_IE] = NLA_POLICY_VALIDATE_FN(NLA_BINARY,
+@@ -427,10 +421,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 	[NL80211_ATTR_WPA_VERSIONS] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_PID] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_4ADDR] = { .type = NLA_U8 },
+-	[NL80211_ATTR_PMKID] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = WLAN_PMKID_LEN
+-	},
++	[NL80211_ATTR_PMKID] = NLA_POLICY_EXACT_LEN_WARN(WLAN_PMKID_LEN),
+ 	[NL80211_ATTR_DURATION] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_COOKIE] = { .type = NLA_U64 },
+ 	[NL80211_ATTR_TX_RATES] = { .type = NLA_NESTED },
+@@ -492,10 +483,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 	[NL80211_ATTR_WDEV] = { .type = NLA_U64 },
+ 	[NL80211_ATTR_USER_REG_HINT_TYPE] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_AUTH_DATA] = { .type = NLA_BINARY, },
+-	[NL80211_ATTR_VHT_CAPABILITY] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = NL80211_VHT_CAPABILITY_LEN
+-	},
++	[NL80211_ATTR_VHT_CAPABILITY] = NLA_POLICY_EXACT_LEN_WARN(NL80211_VHT_CAPABILITY_LEN),
+ 	[NL80211_ATTR_SCAN_FLAGS] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_P2P_CTWINDOW] = NLA_POLICY_MAX(NLA_U8, 127),
+ 	[NL80211_ATTR_P2P_OPPPS] = NLA_POLICY_MAX(NLA_U8, 1),
+@@ -531,10 +519,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 	[NL80211_ATTR_VENDOR_DATA] = { .type = NLA_BINARY },
+ 	[NL80211_ATTR_QOS_MAP] = { .type = NLA_BINARY,
+ 				   .len = IEEE80211_QOS_MAP_LEN_MAX },
+-	[NL80211_ATTR_MAC_HINT] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = ETH_ALEN
+-	},
++	[NL80211_ATTR_MAC_HINT] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
+ 	[NL80211_ATTR_WIPHY_FREQ_HINT] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_TDLS_PEER_CAPABILITY] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_SOCKET_OWNER] = { .type = NLA_FLAG },
+@@ -545,10 +530,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 		NLA_POLICY_MAX(NLA_U8, IEEE80211_NUM_UPS - 1),
+ 	[NL80211_ATTR_ADMITTED_TIME] = { .type = NLA_U16 },
+ 	[NL80211_ATTR_SMPS_MODE] = { .type = NLA_U8 },
+-	[NL80211_ATTR_MAC_MASK] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = ETH_ALEN
+-	},
++	[NL80211_ATTR_MAC_MASK] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
+ 	[NL80211_ATTR_WIPHY_SELF_MANAGED_REG] = { .type = NLA_FLAG },
+ 	[NL80211_ATTR_NETNS_FD] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_SCHED_SCAN_DELAY] = { .type = NLA_U32 },
+@@ -560,21 +542,15 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 	[NL80211_ATTR_MU_MIMO_GROUP_DATA] = {
+ 		.len = VHT_MUMIMO_GROUPS_DATA_LEN
+ 	},
+-	[NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = ETH_ALEN
+-	},
++	[NL80211_ATTR_MU_MIMO_FOLLOW_MAC_ADDR] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
+ 	[NL80211_ATTR_NAN_MASTER_PREF] = NLA_POLICY_MIN(NLA_U8, 1),
+ 	[NL80211_ATTR_BANDS] = { .type = NLA_U32 },
+ 	[NL80211_ATTR_NAN_FUNC] = { .type = NLA_NESTED },
+ 	[NL80211_ATTR_FILS_KEK] = { .type = NLA_BINARY,
+ 				    .len = FILS_MAX_KEK_LEN },
+-	[NL80211_ATTR_FILS_NONCES] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = 2 * FILS_NONCE_LEN
+-	},
++	[NL80211_ATTR_FILS_NONCES] = NLA_POLICY_EXACT_LEN_WARN(2 * FILS_NONCE_LEN),
+ 	[NL80211_ATTR_MULTICAST_TO_UNICAST_ENABLED] = { .type = NLA_FLAG, },
+-	[NL80211_ATTR_BSSID] = { .type = NLA_EXACT_LEN_WARN, .len = ETH_ALEN },
++	[NL80211_ATTR_BSSID] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
+ 	[NL80211_ATTR_SCHED_SCAN_RELATIVE_RSSI] = { .type = NLA_S8 },
+ 	[NL80211_ATTR_SCHED_SCAN_RSSI_ADJUST] = {
+ 		.len = sizeof(struct nl80211_bss_select_rssi_adjust)
+@@ -587,7 +563,7 @@ const struct nla_policy nl80211_policy[NUM_NL80211_ATTR] = {
+ 	[NL80211_ATTR_FILS_ERP_NEXT_SEQ_NUM] = { .type = NLA_U16 },
+ 	[NL80211_ATTR_FILS_ERP_RRK] = { .type = NLA_BINARY,
+ 					.len = FILS_ERP_MAX_RRK_LEN },
+-	[NL80211_ATTR_FILS_CACHE_ID] = { .type = NLA_EXACT_LEN_WARN, .len = 2 },
++	[NL80211_ATTR_FILS_CACHE_ID] = NLA_POLICY_EXACT_LEN_WARN(2),
+ 	[NL80211_ATTR_PMK] = { .type = NLA_BINARY, .len = PMK_MAX_LEN },
+ 	[NL80211_ATTR_SCHED_SCAN_MULTI] = { .type = NLA_FLAG },
+ 	[NL80211_ATTR_EXTERNAL_AUTH_SUPPORT] = { .type = NLA_FLAG },
+@@ -652,10 +628,7 @@ static const struct nla_policy
+ nl80211_wowlan_tcp_policy[NUM_NL80211_WOWLAN_TCP] = {
+ 	[NL80211_WOWLAN_TCP_SRC_IPV4] = { .type = NLA_U32 },
+ 	[NL80211_WOWLAN_TCP_DST_IPV4] = { .type = NLA_U32 },
+-	[NL80211_WOWLAN_TCP_DST_MAC] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = ETH_ALEN
+-	},
++	[NL80211_WOWLAN_TCP_DST_MAC] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
+ 	[NL80211_WOWLAN_TCP_SRC_PORT] = { .type = NLA_U16 },
+ 	[NL80211_WOWLAN_TCP_DST_PORT] = { .type = NLA_U16 },
+ 	[NL80211_WOWLAN_TCP_DATA_PAYLOAD] = { .type = NLA_MIN_LEN, .len = 1 },
+@@ -685,18 +658,9 @@ nl80211_coalesce_policy[NUM_NL80211_ATTR_COALESCE_RULE] = {
+ /* policy for GTK rekey offload attributes */
+ static const struct nla_policy
+ nl80211_rekey_policy[NUM_NL80211_REKEY_DATA] = {
+-	[NL80211_REKEY_DATA_KEK] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = NL80211_KEK_LEN,
+-	},
+-	[NL80211_REKEY_DATA_KCK] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = NL80211_KCK_LEN,
+-	},
+-	[NL80211_REKEY_DATA_REPLAY_CTR] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = NL80211_REPLAY_CTR_LEN
+-	},
++	[NL80211_REKEY_DATA_KEK] = NLA_POLICY_EXACT_LEN_WARN(NL80211_KEK_LEN),
++	[NL80211_REKEY_DATA_KCK] = NLA_POLICY_EXACT_LEN_WARN(NL80211_KCK_LEN),
++	[NL80211_REKEY_DATA_REPLAY_CTR] = NLA_POLICY_EXACT_LEN_WARN(NL80211_REPLAY_CTR_LEN),
+ };
+ 
+ static const struct nla_policy
+@@ -711,10 +675,7 @@ static const struct nla_policy
+ nl80211_match_policy[NL80211_SCHED_SCAN_MATCH_ATTR_MAX + 1] = {
+ 	[NL80211_SCHED_SCAN_MATCH_ATTR_SSID] = { .type = NLA_BINARY,
+ 						 .len = IEEE80211_MAX_SSID_LEN },
+-	[NL80211_SCHED_SCAN_MATCH_ATTR_BSSID] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = ETH_ALEN
+-	},
++	[NL80211_SCHED_SCAN_MATCH_ATTR_BSSID] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
+ 	[NL80211_SCHED_SCAN_MATCH_ATTR_RSSI] = { .type = NLA_U32 },
+ 	[NL80211_SCHED_SCAN_MATCH_PER_BAND_RSSI] =
+ 		NLA_POLICY_NESTED(nl80211_match_band_rssi_policy),
+@@ -746,10 +707,7 @@ nl80211_nan_func_policy[NL80211_NAN_FUNC_ATTR_MAX + 1] = {
+ 	[NL80211_NAN_FUNC_SUBSCRIBE_ACTIVE] = { .type = NLA_FLAG },
+ 	[NL80211_NAN_FUNC_FOLLOW_UP_ID] = { .type = NLA_U8 },
+ 	[NL80211_NAN_FUNC_FOLLOW_UP_REQ_ID] = { .type = NLA_U8 },
+-	[NL80211_NAN_FUNC_FOLLOW_UP_DEST] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = ETH_ALEN
+-	},
++	[NL80211_NAN_FUNC_FOLLOW_UP_DEST] = NLA_POLICY_EXACT_LEN_WARN(ETH_ALEN),
+ 	[NL80211_NAN_FUNC_CLOSE_RANGE] = { .type = NLA_FLAG },
+ 	[NL80211_NAN_FUNC_TTL] = { .type = NLA_U32 },
+ 	[NL80211_NAN_FUNC_SERVICE_INFO] = { .type = NLA_BINARY,
+@@ -4172,10 +4130,7 @@ static const struct nla_policy nl80211_txattr_policy[NL80211_TXRATE_MAX + 1] = {
+ 				    .len = NL80211_MAX_SUPP_RATES },
+ 	[NL80211_TXRATE_HT] = { .type = NLA_BINARY,
+ 				.len = NL80211_MAX_SUPP_HT_RATES },
+-	[NL80211_TXRATE_VHT] = {
+-		.type = NLA_EXACT_LEN_WARN,
+-		.len = sizeof(struct nl80211_txrate_vht),
+-	},
++	[NL80211_TXRATE_VHT] = NLA_POLICY_EXACT_LEN_WARN(sizeof(struct nl80211_txrate_vht)),
+ 	[NL80211_TXRATE_GI] = { .type = NLA_U8 },
+ };
+ 
+-- 
+2.25.1
+
diff --git a/debian/patches/series b/debian/patches/series
index f4462c8..f19b067 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,12 @@
 0002-fix-format-overflow-compile-error-in-kconf-confdata..patch
 0005-Makefile.kernel-pass-fno-stack-clash-protection-and-.patch
 0006-backport-address-interface-change-in-linux-skbuff.h-.patch
+0007-backport-add-genlmsg_parse.patch
+0008-backport-update-include-uapi-linux-pci_regs.h.patch
+0009-NOUPSTREAM-iwlwifi-mvm-use-64-bit-version-of-timespe.patch
+0010-NOUPSTREAM-cfg80211-use-parallel_ops-for-genl.patch
+0011-backports-netlink-fix-nla_validate_nested.patch
+0012-netlink-rename-nl80211_validate_nested-to-nla_valida.patch
+0013-ftrace-Rework-event_create_dir.patch
+0014-nl80211-fix-NL80211_ATTR_FTM_RESPONDER-policy.patch
+0015-NOUPSTREAM-nl80211-pull-in-NLA_POLICY_EXACT_LEN_WARN.patch