mochabin/mwifiex
1
0
Fork 0
mirror of https://github.com/nxp-imx/mwifiex.git synced 2025-01-15 16:25:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

MA-21171 mxm_wifiex: Fix kernel update build errors

Browse source 
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 <zhipeng.wang_1@nxp.com>
This commit is contained in:
Zhipeng Wang 2023-04-07 10:25:12 +00:00
parent 952cbd9afd
commit 781effe72a
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mxm_wifiex/wlan_src/mlinux/moal_cfg80211.c
View file

@ -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

2
mxm_wifiex/wlan_src/mlinux/moal_shim.c
View file

@ -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

2
mxm_wifiex/wlan_src/mlinux/moal_uap_cfg80211.c
View file

@ -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