diff -Nru backport-iwlwifi-dkms-11289/debian/changelog backport-iwlwifi-dkms-11289/debian/changelog --- backport-iwlwifi-dkms-11289/debian/changelog 2023-05-01 20:33:39.000000000 +0800 +++ backport-iwlwifi-dkms-11289/debian/changelog 2023-10-31 21:30:50.000000000 +0800 @@ -1,3 +1,9 @@ +backport-iwlwifi-dkms (11289-0ubuntu2) mantic; urgency=low + + * Failed to build against linux-unstable 6.6.0-8-generic (LP: #2042059) + + -- You-Sheng Yang Tue, 31 Oct 2023 21:30:50 +0800 + backport-iwlwifi-dkms (11289-0ubuntu1) mantic; urgency=low [You-Sheng Yang] diff -Nru backport-iwlwifi-dkms-11289/debian/patches/0008-backport-genetlink-adjust-to-info-userhdr-removal.patch backport-iwlwifi-dkms-11289/debian/patches/0008-backport-genetlink-adjust-to-info-userhdr-removal.patch --- backport-iwlwifi-dkms-11289/debian/patches/0008-backport-genetlink-adjust-to-info-userhdr-removal.patch 1970-01-01 08:00:00.000000000 +0800 +++ backport-iwlwifi-dkms-11289/debian/patches/0008-backport-genetlink-adjust-to-info-userhdr-removal.patch 2023-10-31 21:30:50.000000000 +0800 @@ -0,0 +1,67 @@ +From: Johannes Berg +Date: Mon, 11 Sep 2023 19:27:37 +0200 +Subject: backport: genetlink: adjust to info->userhdr removal + +BugLink: https://bugs.launchpad.net/bugs/2042059 + +Upstream removed info->userhdr, actually leaving the same +genl_info_userhdr() inline backports already had. Thus, we +need to now gate our use of info->userhdr with an ifdef on +the old version (it was only ever needed in that case, but +still always compiled), and put genl_info_userhdr() under +an ifdef since it's already present in 6.6 upstream. + +Note that for the backports project itself we can also +remove the spatch that translates info->userhdr usage to +genl_info_userhdr() since upstream already did that now +as well. + +type=maint +ticket=none + +Change-Id: I2a9d764e59d538ef6f79fde7186ebab2c3ec6e84 +Signed-off-by: Johannes Berg +Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/73658 +tested: iil_jenkins +Tested-by: iil_jenkins +x-iwlwifi-stack-dev: 08a7bfe38b6baf85746cdff6dbbe0a75609aee2a +(cherry picked from commit 8fd541f76cdc125bd4bc473872697897c6c00b0d) +Signed-off-by: You-Sheng Yang +--- + backport-include/net/genetlink.h | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/backport-include/net/genetlink.h b/backport-include/net/genetlink.h +index 3b75b47..9df813c 100644 +--- a/backport-include/net/genetlink.h ++++ b/backport-include/net/genetlink.h +@@ -3,6 +3,7 @@ + #include_next + #include + ++#if LINUX_VERSION_IS_LESS(4,12,0) + static inline void __bp_genl_info_userhdr_set(struct genl_info *info, + void *userhdr) + { +@@ -14,7 +15,6 @@ static inline void *__bp_genl_info_userhdr(struct genl_info *info) + return info->userhdr; + } + +-#if LINUX_VERSION_IS_LESS(4,12,0) + #define GENL_SET_ERR_MSG(info, msg) NL_SET_ERR_MSG(genl_info_extack(info), msg) + + static inline int genl_err_attr(struct genl_info *info, int err, +@@ -44,11 +44,13 @@ static inline struct netlink_ext_ack *genl_callback_extack(struct netlink_callba + #endif + } + ++#if LINUX_VERSION_IS_LESS(6,6,0) + /* this gets put in place of info->userhdr, since we use that above */ + static inline void *genl_info_userhdr(struct genl_info *info) + { + return (u8 *)info->genlhdr + GENL_HDRLEN; + } ++#endif + + #if LINUX_VERSION_IS_LESS(4,10,0) + #define __genl_ro_after_init diff -Nru backport-iwlwifi-dkms-11289/debian/patches/series backport-iwlwifi-dkms-11289/debian/patches/series --- backport-iwlwifi-dkms-11289/debian/patches/series 2023-05-01 20:33:39.000000000 +0800 +++ backport-iwlwifi-dkms-11289/debian/patches/series 2023-10-31 21:30:50.000000000 +0800 @@ -5,3 +5,4 @@ 0012-UBUNTU-SAUCE-backport-fix-led_trigger_blink_oneshot.patch 0013-UBUNTU-SAUCE-backport-wrap-net-gso.h.patch 0014-UBUNTU-SAUCE-wifi-iwlwifi-fix-build-against-CONF.patch +0008-backport-genetlink-adjust-to-info-userhdr-removal.patch