Control: tag -1 + patch

Hi Andreas,

Quoting Andreas Beckmann (2025-04-29 21:59:05)
> ezurio-qcacld-2.0-dkms fails to build a module for Linux 6.14 in
> experimental:
> 
> CORE/HDD/src/wlan_hdd_cfg80211.c:33528:21: error: initialization of 'int 
> (*)(struct wiphy *, struct wireless_dev *, unsigned int,  int *)' from 
> incompatible pointer type 'int (*)(struct wiphy *, struct wireless_dev *, int 
> *)' [-Wincompatible-pointer-types]
> 33528 |     .get_tx_power = wlan_hdd_cfg80211_get_txpower,
> 
> This seems to be caused by Linux commit
> "wifi: cfg80211: send MLO links tx power info in GET_INTERFACE" in v6.14-rc1
> https://github.com/torvalds/linux/commit/7a53af85d3bbdbe06cd47b81a6d99a04dc0a3963

this diff fixes it:

--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -26309,6 +26309,9 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy 
*wiphy,
 static int wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0) || defined(WITH_BACKPORTS)
                                         struct wireless_dev *wdev,
+#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
+                                        unsigned int link_id,
 #endif
                                         int *dbm)
 {

I'll upload this after Trixie. I'm also working on 6.15 support right now.

Thanks!

cheers, josch

Attachment: signature.asc
Description: signature

Reply via email to