mochabin/mwifiex
1
0
Fork 0
mirror of https://github.com/nxp-imx/mwifiex.git synced 2024-11-14 11:05:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

MA-20371-1 Fix build errors of wifi driver after merge AOSP kernel

Browse source 
After merge AOSP kernel added patch:
BACKPORT: FROMLIST: wifi: cfg80211: Add link_id parameter to various key operations for MLO

The patches has been merged into an upstream maintainer
tree, but has not yet been merged into Linux mainline.
More importantly, the patches changed the function,
resulting in build errors.

Signed-off-by: Zhipeng Wang <zhipeng.wang_1@nxp.com>
This commit is contained in:
Zhipeng Wang 2022-08-09 11:46:54 +00:00
parent 4310e0ca2f
commit a9bb8a1e1c
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1375,7 +1375,7 @@ fail:
*/
#endif
int woal_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
t_u8 key_index,
int link_id, t_u8 key_index,
#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE
bool pairwise,
#endif
@ -1431,7 +1431,7 @@ int woal_cfg80211_add_key(struct wiphy *wiphy, struct net_device *netdev,
*/
#endif
int woal_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
t_u8 key_index,
int link_id, t_u8 key_index,
#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE
bool pairwise,
#endif
@ -1486,7 +1486,7 @@ int woal_cfg80211_del_key(struct wiphy *wiphy, struct net_device *netdev,
*/
#endif
int woal_cfg80211_set_default_key(struct wiphy *wiphy,
struct net_device *netdev, t_u8 key_index
struct net_device *netdev, int link_id, t_u8 key_index
#if KERNEL_VERSION(2, 6, 37) < CFG80211_VERSION_CODE
,
bool ucast, bool mcast
@ -1517,7 +1517,7 @@ int woal_cfg80211_set_default_key(struct wiphy *wiphy,
#if KERNEL_VERSION(2, 6, 30) <= CFG80211_VERSION_CODE
int woal_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,
struct net_device *netdev,
struct net_device *netdev, int link_id,
t_u8 key_index)
{
PRINTM(MINFO, "set default mgmt key, key index=%d\n", key_index);
@ -1528,7 +1528,7 @@ int woal_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,
#if KERNEL_VERSION(5, 10, 0) <= CFG80211_VERSION_CODE
int woal_cfg80211_set_default_beacon_key(struct wiphy *wiphy,
struct net_device *netdev,
struct net_device *netdev, int link_id,
t_u8 key_index)
{
PRINTM(MINFO, "set default beacon key, key index=%d\n", key_index);

12
mxm_wifiex/wlan_src/mlinux/moal_cfg80211.h
View file

@ -136,14 +136,14 @@ int woal_cfg80211_change_virtual_intf(struct wiphy *wiphy,
int woal_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
int woal_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
t_u8 key_index,
int link_id, t_u8 key_index,
#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE
bool pairwise,
#endif
const t_u8 *mac_addr, struct key_params *params);
int woal_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
t_u8 key_index,
int link_id, t_u8 key_index,
#if KERNEL_VERSION(2, 6, 36) < CFG80211_VERSION_CODE
bool pairwise,
#endif
@ -211,22 +211,22 @@ int woal_cfg80211_set_channel(struct wiphy *wiphy,
#endif
#if KERNEL_VERSION(2, 6, 37) < CFG80211_VERSION_CODE
int woal_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *dev,
int woal_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *dev, int link_id,
t_u8 key_index, bool ucast, bool mcast);
#else
int woal_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *dev,
int woal_cfg80211_set_default_key(struct wiphy *wiphy, struct net_device *dev, int link_id,
t_u8 key_index);
#endif
#if KERNEL_VERSION(2, 6, 30) <= CFG80211_VERSION_CODE
int woal_cfg80211_set_default_mgmt_key(struct wiphy *wiphy,
struct net_device *netdev,
struct net_device *netdev, int link_id,
t_u8 key_index);
#endif
#if KERNEL_VERSION(5, 10, 0) <= CFG80211_VERSION_CODE
int woal_cfg80211_set_default_beacon_key(struct wiphy *wiphy,
struct net_device *netdev,
struct net_device *netdev, int link_id,
t_u8 key_index);
#endif