mac80211: fix ath12k driver compilation with gcc13

Fix various compilation issues in the ath12k driver for gcc13:
- Remove invalid ATH12K_DBG_WMI parameter from ath12k_warn calls
- Fix return type mismatch in ath12k_mac_he_gi_to_nl80211_he_gi

Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
John Crispin
2025-10-19 00:00:00 +02:00
parent c093c9425f
commit 91f443582f

View File

@@ -0,0 +1,67 @@
--- a/drivers/net/wireless/ath/ath12k/wmi.c
+++ b/drivers/net/wireless/ath/ath12k/wmi.c
@@ -13902,7 +13902,7 @@ ath12k_wmi_dcs_interference_event(struct
break;
default:
- ath12k_warn(ab, ATH12K_DBG_WMI,
+ ath12k_warn(ab,
"For pdev=%d, Invalid Interference type=%d recieved from FW",
pdev_id, interference_type);
break;
--- a/drivers/net/wireless/ath/ath12k/mac.c
+++ b/drivers/net/wireless/ath/ath12k/mac.c
@@ -415,7 +415,7 @@ enum nl80211_eht_ru_alloc ath12k_mac_eht
return ret;
}
-enum nl80211_he_gi ath12k_mac_he_gi_to_nl80211_he_gi(u8 sgi)
+u32 ath12k_mac_he_gi_to_nl80211_he_gi(u8 sgi)
{
enum nl80211_he_gi ret;
--- a/drivers/net/wireless/ath/ath12k/vendor.c
+++ b/drivers/net/wireless/ath/ath12k/vendor.c
@@ -2760,7 +2760,7 @@ static int ath12k_vendor_receive_afc_res
if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_AFC_RESP_MAX, data, data_len,
ath12k_cfg80211_afc_response_policy, NULL)) {
- ath12k_warn(ar->ab, ATH12K_DBG_AFC,
+ ath12k_warn(ar->ab,
"invalid set afc config policy attribute\n");
return -EINVAL;
}
@@ -2779,7 +2779,7 @@ static int ath12k_vendor_receive_afc_res
*/
afc_rsp = kzalloc(afc_resp_len, GFP_KERNEL);
} else {
- ath12k_warn(ar->ab, ATH12K_DBG_AFC,
+ ath12k_warn(ar->ab,
"AFC JSON data is not present!");
return -EINVAL;
}
@@ -2790,13 +2790,13 @@ static int ath12k_vendor_receive_afc_res
tb[QCA_WLAN_VENDOR_ATTR_AFC_RESP_DATA],
afc_resp_len);
} else {
- ath12k_warn(ar->ab, ATH12K_DBG_AFC,
+ ath12k_warn(ar->ab,
"Response buffer allocation failed");
return -EINVAL;
}
} else {
- ath12k_warn(ar->ab, ATH12K_DBG_AFC,
+ ath12k_warn(ar->ab,
"AFC JSON data not found");
return -EINVAL;
}
@@ -2829,7 +2829,7 @@ static int ath12k_vendor_receive_afc_res
break;
default:
- ath12k_warn(ar->ab, ATH12K_DBG_AFC, "Invalid response format type %d\n",
+ ath12k_warn(ar->ab, "Invalid response format type %d\n",
afc_resp_format);
ret = -EINVAL;
goto exit;