From a8652d62aa49e0f10d48344af58d557265558f05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joan=20Bruguera=20Mic=C3=B3?= Date: Thu, 24 Sep 2026 14:32:59 +0000 Subject: [PATCH] Tentative patch for broadcom-wl 6.30.223.271 driver for Linux 7.4-rc1 Next-20260929 The .ndo_do_ioctl has not been called since many kernel versions, so removing it ensurely shouldn't break anything. --- src/wl/sys/wl_cfg80211_hybrid.c | 39 +++++++++++++++++++++++++++++---- src/wl/sys/wl_linux.c | 6 +++++ 2 files changed, 41 insertions(+), 4 deletions(-) diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c index a70d888..34170f4 100644 --- a/src/wl/sys/wl_cfg80211_hybrid.c +++ b/src/wl/sys/wl_cfg80211_hybrid.c @@ -131,7 +131,19 @@ static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy, struct net_device *dev, u8 key_idx); #endif -#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 4, 0) +// Rel. commit "wifi: cfg80211: add Control Integrity Protocol (CIP) APIs" (Benjamin Berg, 21 Sep 2026) +static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct wireless_dev *wdev, + int link_id, u8 key_idx, enum nl80211_key_type type, + const u8 *mac_addr, struct key_params *params); +static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct wireless_dev *wdev, + int link_id, u8 key_idx, enum nl80211_key_type type, + const u8 *mac_addr); +static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct wireless_dev *wdev, + int link_id, u8 key_idx, enum nl80211_key_type type, + const u8 *mac_addr, void *cookie, + void (*callback) (void *cookie, struct key_params *params)); +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0) static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct wireless_dev *wdev, int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params); @@ -1242,7 +1254,13 @@ wl_cfg80211_config_default_key(struct wiphy *wiphy, return 0; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 4, 0) +// Rel. commit "wifi: cfg80211: add Control Integrity Protocol (CIP) APIs" (Benjamin Berg, 21 Sep 2026) +static s32 +wl_cfg80211_add_key(struct wiphy *wiphy, struct wireless_dev *wdev, + int link_id, u8 key_idx, enum nl80211_key_type type, + const u8 *mac_addr, struct key_params *params) +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0) static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct wireless_dev *wdev, int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, @@ -1376,7 +1394,13 @@ wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev, return err; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 4, 0) +// Rel. commit "wifi: cfg80211: add Control Integrity Protocol (CIP) APIs" (Benjamin Berg, 21 Sep 2026) +static s32 +wl_cfg80211_del_key(struct wiphy *wiphy, struct wireless_dev *wdev, + int link_id, u8 key_idx, enum nl80211_key_type type, + const u8 *mac_addr) +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0) static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct wireless_dev *wdev, int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr) @@ -1430,7 +1454,14 @@ wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev, return err; } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(7, 4, 0) +// Rel. commit "wifi: cfg80211: add Control Integrity Protocol (CIP) APIs" (Benjamin Berg, 21 Sep 2026) +static s32 +wl_cfg80211_get_key(struct wiphy *wiphy, struct wireless_dev *wdev, + int link_id, u8 key_idx, enum nl80211_key_type type, + const u8 *mac_addr, void *cookie, + void (*callback) (void *cookie, struct key_params * params)) +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(7, 1, 0) static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct wireless_dev *wdev, int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c index 07a4acb..4130b23 100644 --- a/src/wl/sys/wl_linux.c +++ b/src/wl/sys/wl_linux.c @@ -460,14 +460,20 @@ static const struct net_device_ops wl_netdev_ops = #else .ndo_set_multicast_list = wl_set_multicast_list, #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 4, 0) + // Rel. commit "net: remove ndo_do_ioctl handler" (Arnd Bergmann, 15 Sep 2026) .ndo_do_ioctl = wl_ioctl +#endif }; static const struct net_device_ops wl_netdev_monitor_ops = { .ndo_start_xmit = wl_monitor_start, .ndo_get_stats = wl_get_stats, +#if LINUX_VERSION_CODE < KERNEL_VERSION(7, 4, 0) + // Rel. commit "net: remove ndo_do_ioctl handler" (Arnd Bergmann, 15 Sep 2026) .ndo_do_ioctl = wl_ioctl +#endif }; #endif -- 2.56.0