diff options
| author | Hauke Mehrtens | 2025-09-03 18:45:02 +0000 |
|---|---|---|
| committer | Hauke Mehrtens | 2025-09-04 10:08:06 +0000 |
| commit | 65269fd3fcfb442cdbf41276404d9d045b3312a6 (patch) | |
| tree | 224c250d2a85ef4522674ff32e39c810f176fb89 | |
| parent | c46cccde284ce15c4e6c0cb49da510acb748d238 (diff) | |
| download | openwrt-65269fd3fcfb442cdbf41276404d9d045b3312a6.tar.gz | |
mac80211: Fix build of rt2800soc
This fixes the following build problem:
```
/drivers/net/wireless/ralink/rt2x00/rt2800soc.c:276:27: error: initialization of 'int (*)(struct platform_device *)' from incompatible pointer type 'void (*)(struct platform_device *)' [-Werror=incompatible-pointer-types]
276 | .remove = rt2x00soc_remove,
| ^~~~~~~~~~~~~~~~
```
Fixes: b4b9288f2aa3 ("mac80211: Update to 6.12.44")
Link: https://github.com/openwrt/openwrt/pull/19946
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | package/kernel/mac80211/patches/rt2x00/997-rt2x00-use-remove_new.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/rt2x00/997-rt2x00-use-remove_new.patch b/package/kernel/mac80211/patches/rt2x00/997-rt2x00-use-remove_new.patch new file mode 100644 index 0000000000..f857301e6f --- /dev/null +++ b/package/kernel/mac80211/patches/rt2x00/997-rt2x00-use-remove_new.patch @@ -0,0 +1,26 @@ +Switch rt2800soc from .remove to .remove_new callback + +The rt2x00soc_remove() function was converted to the new .remove API. +Kernel 6.6 still uses the old .remove API, switch to .remove_new. + +rt2800soc was switched in upstream commit: +https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-6.12.y&id=06c566371f8afd582b9080f2d076509a4c78ae60 + +This fixes the following build problem: +``` +/drivers/net/wireless/ralink/rt2x00/rt2800soc.c:276:27: error: initialization of 'int (*)(struct platform_device *)' from incompatible pointer type 'void (*)(struct platform_device *)' [-Werror=incompatible-pointer-types] + 276 | .remove = rt2x00soc_remove, + | ^~~~~~~~~~~~~~~~ +``` + +--- a/drivers/net/wireless/ralink/rt2x00/rt2800soc.c ++++ b/drivers/net/wireless/ralink/rt2x00/rt2800soc.c +@@ -273,7 +273,7 @@ static struct platform_driver rt2800soc_ + .of_match_table = rt2880_wmac_match, + }, + .probe = rt2800soc_probe, +- .remove = rt2x00soc_remove, ++ .remove_new = rt2x00soc_remove, + .suspend = rt2x00soc_suspend, + .resume = rt2x00soc_resume, + }; |