Skip to content

Fix for compilation issues for kernel 6.14.0 on Ubuntu #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavmar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix for compilation issues for kernel 6.14.0 on Ubuntu #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions drivers/aic8800/aic8800_fdrv/rwnx_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3842,6 +3842,7 @@ cfg80211_chandef_identical(const struct cfg80211_chan_def *chandef1,
#endif

static int rwnx_cfg80211_set_monitor_channel(struct wiphy *wiphy,
struct net_device *dev,
struct cfg80211_chan_def *chandef)
{
struct rwnx_hw *rwnx_hw = wiphy_priv(wiphy);
Expand Down Expand Up @@ -4367,7 +4368,7 @@ static int rwnx_cfg80211_get_channel(struct wiphy *wiphy,
if (rwnx_vif->vif_index == rwnx_hw->monitor_vif)
{
//retrieve channel from firmware
rwnx_cfg80211_set_monitor_channel(wiphy, NULL);
rwnx_cfg80211_set_monitor_channel(wiphy, NULL, NULL);
}

//Check if channel context is valid
Expand Down Expand Up @@ -4551,6 +4552,7 @@ int rwnx_cfg80211_start_radar_detection(struct wiphy *wiphy,
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0))
, u32 cac_time_ms
#endif
, int fix
)
{
struct rwnx_hw *rwnx_hw = wiphy_priv(wiphy);
Expand Down Expand Up @@ -8540,7 +8542,7 @@ static void __exit rwnx_mod_exit(void)
module_init(rwnx_mod_init);
module_exit(rwnx_mod_exit);
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
MODULE_IMPORT_NS("VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver");
#endif
MODULE_FIRMWARE(RWNX_CONFIG_FW_NAME);

Expand Down
4 changes: 2 additions & 2 deletions drivers/aic8800/aic8800_fdrv/rwnx_radar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1399,7 +1399,7 @@ static void rwnx_radar_cac_work(struct work_struct *ws)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
&ctxt->chan_def,
#endif
NL80211_RADAR_CAC_FINISHED, GFP_KERNEL);
NL80211_RADAR_CAC_FINISHED, GFP_KERNEL, 0);
rwnx_send_apm_stop_cac_req(rwnx_hw, radar->cac_vif);
rwnx_chanctx_unlink(radar->cac_vif);

Expand Down Expand Up @@ -1499,7 +1499,7 @@ void rwnx_radar_cancel_cac(struct rwnx_radar *radar)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)
&ctxt->chan_def,
#endif
NL80211_RADAR_CAC_ABORTED, GFP_KERNEL);
NL80211_RADAR_CAC_ABORTED, GFP_KERNEL, 0);
rwnx_chanctx_unlink(radar->cac_vif);
}

Expand Down
2 changes: 1 addition & 1 deletion drivers/aic8800/aic_load_fw/aic_bluetooth_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ module_init(aic_bluetooth_mod_init);
module_exit(aic_bluetooth_mod_exit);

#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0)
MODULE_IMPORT_NS(VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver);
MODULE_IMPORT_NS("VFS_internal_I_am_really_a_filesystem_and_am_NOT_a_driver");
#endif

MODULE_FIRMWARE(DRV_CONFIG_FW_NAME);
Expand Down