From 781effe72a66d6c2509179708285c9ed0abbf60b Mon Sep 17 00:00:00 2001 From: Zhipeng Wang Date: Fri, 7 Apr 2023 10:25:12 +0000 Subject: [PATCH] MA-21171 mxm_wifiex: Fix kernel update build errors After kernel merge aosp/android14-6.1, the following error is encountered: nxp-mwifiex/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c:5006:54: error: too few arguments to function call, expected 4, have 3 cfg80211_ch_switch_notify(priv->netdev, &chandef, 0); This is caused by kernel patch 541c3b73ddf0("UPSTREAM: wifi: cfg80211: include puncturing bitmap in channel switch events"), now cfg80211_ch_switch_notify() needs four parameters. Change-Id: I343a89b8466971f486f0ce8937c1612dec5618fa Signed-off-by: Zhipeng Wang --- mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c | 2 ++ mxm_wifiex/wlan_src/mlinux/moal_shim.c | 2 ++ mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c b/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c index ca3621c..de92cad 100644 --- a/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c +++ b/mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c @@ -5004,6 +5004,8 @@ void woal_cfg80211_notify_channel(moal_private *priv, #endif #if CFG80211_VERSION_CODE >= KERNEL_VERSION(6, 2, 0) cfg80211_ch_switch_notify(priv->netdev, &chandef, 0, 0); +#elif ((CFG80211_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) && IMX_ANDROID_13)) + cfg80211_ch_switch_notify(priv->netdev, &chandef, 0, 0); #elif ((CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || IMX_ANDROID_13) cfg80211_ch_switch_notify(priv->netdev, &chandef, 0); #else diff --git a/mxm_wifiex/wlan_src/mlinux/moal_shim.c b/mxm_wifiex/wlan_src/mlinux/moal_shim.c index 0886fb7..e827d7b 100644 --- a/mxm_wifiex/wlan_src/mlinux/moal_shim.c +++ b/mxm_wifiex/wlan_src/mlinux/moal_shim.c @@ -3469,6 +3469,8 @@ mlan_status moal_recv_event(t_void *pmoal, pmlan_event pmevent) priv->channel); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(6, 2, 0) cfg80211_ch_switch_notify(priv->netdev, &priv->chan, 0, 0); +#elif ((CFG80211_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) && IMX_ANDROID_13)) + cfg80211_ch_switch_notify(priv->netdev, &priv->chan, 0, 0); #elif ((CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || IMX_ANDROID_13) cfg80211_ch_switch_notify(priv->netdev, &priv->chan, 0); #else diff --git a/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c b/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c index eafbcc2..27cb610 100644 --- a/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c +++ b/mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c @@ -3469,6 +3469,8 @@ static void woal_switch_uap_channel(moal_private *priv, t_u8 wait_option) sizeof(struct cfg80211_chan_def), sizeof(priv->chan)); #if CFG80211_VERSION_CODE >= KERNEL_VERSION(6, 2, 0) cfg80211_ch_switch_notify(priv->netdev, &priv->chan, 0, 0); +#elif ((CFG80211_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) && IMX_ANDROID_13)) + cfg80211_ch_switch_notify(priv->netdev, &priv->chan, 0, 0); #elif ((CFG80211_VERSION_CODE >= KERNEL_VERSION(5, 19, 2)) || IMX_ANDROID_13) cfg80211_ch_switch_notify(priv->netdev, &priv->chan, 0); #else