From 831002456702566c1c19786a483d79a36c2089d5 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: May 24 2023 15:05:35 +0000 Subject: kABI workaround for mt76_poll_msec() (git-fixes). --- diff --git a/patches.kabi/mt76_poll_msec-kabi-workaround.patch b/patches.kabi/mt76_poll_msec-kabi-workaround.patch new file mode 100644 index 0000000..3fab074 --- /dev/null +++ b/patches.kabi/mt76_poll_msec-kabi-workaround.patch @@ -0,0 +1,31 @@ +From: Takashi Iwai +Subject: kABI workaround for mt76_poll_msec() +Patch-mainline: Never, kABI workaround +References: git-fixes + +Re-create a dummy function __mt76_poll_msec() and re-export for kABI +compatibility, which was converted to a macro in +wifi-mt76-add-flexible-polling-wait-interval-support.patch. + +Signed-off-by: Takashi Iwai + +--- + drivers/net/wireless/mediatek/mt76/util.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +--- a/drivers/net/wireless/mediatek/mt76/util.c ++++ b/drivers/net/wireless/mediatek/mt76/util.c +@@ -138,4 +138,13 @@ int __mt76_worker_fn(void *ptr) + } + EXPORT_SYMBOL_GPL(__mt76_worker_fn); + ++/* FIXME: re-added for SLE kABI compatibility */ ++#undef __mt76_poll_msec ++bool __mt76_poll_msec(struct mt76_dev *dev, u32 offset, u32 mask, u32 val, ++ int timeout) ++{ ++ return ____mt76_poll_msec(dev, offset, mask, val, timeout, 10); ++} ++EXPORT_SYMBOL_GPL(__mt76_poll_msec); ++ + MODULE_LICENSE("Dual BSD/GPL"); diff --git a/series.conf b/series.conf index 6e8a5e6..f210c7e 100644 --- a/series.conf +++ b/series.conf @@ -20737,6 +20737,7 @@ patches.kabi/RDMA-mana-hide-new-rdma_driver_ids.patch patches.kabi/media-dvb_frontend-kabi-workaround.patch patches.kabi/media-dvb_net-kabi-workaround.patch + patches.kabi/mt76_poll_msec-kabi-workaround.patch ######################################################## # SLE15-SP3 OOT performance patches evaluated but left