Репозиторий Sisyphus
Последнее обновление: 1 октября 2023 | Пакетов: 18631 | Посещений: 37038370
en ru br
Репозитории ALT
S:6.30.223.271-alt15.394501.1
5.1: 5.10.91.9.3-alt1.132640.5
www.altlinux.org/Changes

Группа :: Система/Ядро и оборудование
Пакет: kernel-modules-bcmwl-un-def

 Главная   Изменения   Спек   Патчи   Sources   Загрузить   Gear   Bugs and FR  Repocop 

Патч: bcmwl-centos9.patch
Скачать


diff -uNpar kernel-source-bcmwl-6.30.223.271.orig/bcmwl/src/wl/sys/wl_cfg80211_hybrid.c kernel-source-bcmwl-6.30.223.271/bcmwl/src/wl/sys/wl_cfg80211_hybrid.c
--- kernel-source-bcmwl-6.30.223.271.orig/bcmwl/src/wl/sys/wl_cfg80211_hybrid.c	2022-10-19 12:34:49.000000000 +0200
+++ kernel-source-bcmwl-6.30.223.271/bcmwl/src/wl/sys/wl_cfg80211_hybrid.c	2023-02-13 10:40:49.434157511 +0100
@@ -107,7 +107,7 @@ static s32 wl_cfg80211_get_tx_power(stru
 #endif
 
 static s32 wl_cfg80211_config_default_key(struct wiphy *wiphy,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE))
            struct net_device *dev, int link_id, u8 key_idx, bool unicast, bool multicast);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
            struct net_device *dev, u8 key_idx, bool unicast, bool multicast);
@@ -115,7 +115,7 @@ static s32 wl_cfg80211_config_default_ke
            struct net_device *dev, u8 key_idx);
 #endif
 static s32 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE))
            int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
            u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params);
@@ -123,7 +123,7 @@ static s32 wl_cfg80211_add_key(struct wi
            u8 key_idx, const u8 *mac_addr, struct key_params *params);
 #endif
 static s32 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE))
            int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr);
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
            u8 key_idx, bool pairwise, const u8 *mac_addr);
@@ -131,7 +131,7 @@ static s32 wl_cfg80211_del_key(struct wi
 	   u8 key_idx, const u8 *mac_addr);
 #endif
 static s32 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE))
            int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr,
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
            u8 key_idx, bool pairwise, const u8 *mac_addr,
@@ -1209,7 +1209,7 @@ static s32 wl_cfg80211_get_tx_power(stru
 
 static s32
 wl_cfg80211_config_default_key(struct wiphy *wiphy,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE)) 
 	struct net_device *dev, int link_id, u8 key_idx, bool unicast, bool multicast)
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)
 	struct net_device *dev, u8 key_idx, bool unicast, bool multicast)
@@ -1234,7 +1234,7 @@ wl_cfg80211_config_default_key(struct wi
 
 static s32
 wl_cfg80211_add_key(struct wiphy *wiphy, struct net_device *dev,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE))
                     int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
                     u8 key_idx, bool pairwise, const u8 *mac_addr, struct key_params *params)
@@ -1354,7 +1354,7 @@ wl_cfg80211_add_key(struct wiphy *wiphy,
 }
 static s32
 wl_cfg80211_del_key(struct wiphy *wiphy, struct net_device *dev,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE))
                     int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr)
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
                     u8 key_idx, bool pairwise, const u8 *mac_addr)
@@ -1397,7 +1397,7 @@ wl_cfg80211_del_key(struct wiphy *wiphy,
 
 static s32
 wl_cfg80211_get_key(struct wiphy *wiphy, struct net_device *dev,
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0)
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) || (RHEL_RELEASE_VERSION(9, 0) <= RHEL_RELEASE_CODE))
                     int link_id, u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
 #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
                     u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
@@ -2419,7 +2419,7 @@ wl_bss_roaming_done(struct wl_cfg80211_p
 	struct wl_cfg80211_connect_info *conn_info = wl_to_conn(wl);
 #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
 	struct cfg80211_roam_info roam_info = {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)) && (RHEL_RELEASE_VERSION(9, 0) > RHEL_RELEASE_CODE)
 		.bssid = wl->profile->bssid,
 #else
 		.links[0].bssid = wl->profile->bssid,
diff -uNpar kernel-source-bcmwl-6.30.223.271.orig/bcmwl/src/wl/sys/wl_linux.c kernel-source-bcmwl-6.30.223.271/bcmwl/src/wl/sys/wl_linux.c
--- kernel-source-bcmwl-6.30.223.271.orig/bcmwl/src/wl/sys/wl_linux.c	2022-10-19 12:34:49.000000000 +0200
+++ kernel-source-bcmwl-6.30.223.271/bcmwl/src/wl/sys/wl_linux.c	2023-02-13 10:17:28.507938955 +0100
@@ -3333,7 +3333,7 @@ wl_proc_read(char *buffer, char **start,
 static ssize_t
 wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
 {
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)) && (RHEL_RELEASE_VERSION(9, 0) > RHEL_RELEASE_CODE)
 	wl_info_t * wl = PDE_DATA(file_inode(filp));
 #else
 	wl_info_t * wl = pde_data(file_inode(filp));
@@ -3394,7 +3394,7 @@ wl_proc_write(struct file *filp, const c
 static ssize_t
 wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
 {
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)) && (RHEL_RELEASE_VERSION(9, 0) > RHEL_RELEASE_CODE)
 	wl_info_t * wl = PDE_DATA(file_inode(filp));
 #else
 	wl_info_t * wl = pde_data(file_inode(filp));
 
дизайн и разработка: Vladimir Lettiev aka crux © 2004-2005, Andrew Avramenko aka liks © 2007-2008
текущий майнтейнер: Michael Shigorin