Request 6558 (accepted)

Overview

Request 6558 (accepted)

- Update broadcom-wl.linux-7.2.patch
- Add leap161.patch

Created by manfred-h 26 days ago
In state accepted
Package maintainer: manfred-h
Open review for manfred-h

Submit broadcom-wl

Submit package home:manfred-h / broadcom-wl to package Essentials / broadcom-wl

broadcom-wl.changes Changed

broadcom-wl.spec Changed

broadcom-wl.linux-7.2.patch Changed

@@ -9,10 +9,11 @@
  src/wl/sys/wl_linux.c  | 15 +++++++++++++++
  2 files changed, 26 insertions(+)
 
-diff -rup a/src/shared/linux_osl.c b/src/shared/linux_osl.c
---- a/src/shared/linux_osl.c	2026-07-13 19:46:34.643647982 +0200
-+++ b/src/shared/linux_osl.c	2026-07-13 19:47:45.438124687 +0200
-@@ -475,8 +475,13 @@ osl_debug_malloc(osl_t *osh, uint size,
+diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c
+index c7b350c..e178132 100644
+--- a/src/shared/linux_osl.c
++++ b/src/shared/linux_osl.c
+@@ -471,8 +471,13 @@ osl_debug_malloc(osl_t *osh, uint size, int line, const char* file)
  	if (!basename)
  		basename = file;
  
@@ -26,7 +27,7 @@
  
  	if (osh) {
  		p->prev = NULL;
-@@ -872,7 +877,13 @@ osl_strcpy(char *d, const char *s)
+@@ -860,7 +865,13 @@ osl_strcpy(char *d, const char *s)
  char*
  osl_strncpy(char *d, const char *s, uint n)
  {
@@ -40,10 +41,11 @@
  }
  
  char*
-diff -rup a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
---- a/src/wl/sys/wl_linux.c	2026-07-13 19:46:34.693309209 +0200
-+++ b/src/wl/sys/wl_linux.c	2026-07-13 19:47:45.438347665 +0200
-@@ -1318,8 +1318,13 @@ wl_alloc_linux_if(wl_if_t *wlif)
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index df00e46..fbf5c75 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -1315,8 +1315,13 @@ wl_alloc_linux_if(wl_if_t *wlif)
  	bzero(dev, sizeof(struct net_device));
  	ether_setup(dev);
  
@@ -57,7 +59,7 @@
  
  	priv_link = MALLOC(wl->osh, sizeof(priv_link_t));
  	if (!priv_link) {
-@@ -1536,8 +1541,13 @@ wl_get_driver_info(struct net_device *de
+@@ -1533,8 +1538,13 @@ wl_get_driver_info(struct net_device *dev, struct ethtool_drvinfo *info)
  #endif
  	bzero(info, sizeof(struct ethtool_drvinfo));
  	snprintf(info->driver, sizeof(info->driver), "wl%d", wl->pub->unit);
@@ -71,7 +73,7 @@
  }
  
  static int
-@@ -3033,7 +3043,12 @@ _wl_add_monitor_if(wl_task_t *task)
+@@ -3021,7 +3031,12 @@ _wl_add_monitor_if(wl_task_t *task)
  	}
  
  	ASSERT(strlen(wlif->name) > 0);
@@ -84,3 +86,6 @@
  
  	wl->monitor_dev = dev;
  	if (wl->monitor_type == 1)
+-- 
+2.54.0
+

leap161.patch Added

@@ -0,0 +1,98 @@
+diff -Naur default/src/include/linuxver.h defaultn/src/include/linuxver.h
+--- default/src/include/linuxver.h	2026-07-22 19:44:58.044509063 +0200
++++ defaultn/src/include/linuxver.h	2026-07-22 19:59:56.308616822 +0200
+@@ -151,7 +151,7 @@
+ #include <linux/sched.h>
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 13, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 12, 0)
+ #include <net/lib80211.h>
+ #endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 29)
+diff -Naur default/src/wl/sys/wl_cfg80211_hybrid.c defaultn/src/wl/sys/wl_cfg80211_hybrid.c
+--- default/src/wl/sys/wl_cfg80211_hybrid.c	2026-07-22 19:44:58.046509070 +0200
++++ defaultn/src/wl/sys/wl_cfg80211_hybrid.c	2026-07-22 19:59:48.874588984 +0200
+@@ -61,7 +61,7 @@
+ static s32 wl_cfg80211_scan(struct wiphy *wiphy, struct net_device *ndev,
+            struct cfg80211_scan_request *request);
+ #endif
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx, u32 changed);
+ #else
+ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed);
+@@ -88,7 +88,7 @@
+            struct cfg80211_connect_params *sme);
+ static s32 wl_cfg80211_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason_code);
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, int radio_idx,
+                                     enum nl80211_tx_power_setting type, s32 dbm);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+@@ -103,10 +103,10 @@
+            enum tx_power_setting type, s32 dbm);
+ #endif
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, int radio_idx,
+                                     u32 link_id, s32 *dbm);
+-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
+                                     unsigned int link_id, s32 *dbm);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+@@ -673,7 +673,7 @@
+ 	return err;
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, int radio_idx, u32 changed)
+ #else
+ static s32 wl_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
+@@ -1112,7 +1112,7 @@
+ 	return err;
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ static s32 wl_cfg80211_set_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, int radio_idx,
+                                     enum nl80211_tx_power_setting type, s32 dbm)
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+@@ -1176,10 +1176,10 @@
+ 	return err;
+ }
+ 
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 17, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev, int radio_idx,
+                                     u32 link_id, s32 *dbm)
+-#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ static s32 wl_cfg80211_get_tx_power(struct wiphy *wiphy, struct wireless_dev *wdev,
+                                     unsigned int link_id, s32 *dbm)
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)
+diff -Naur default/src/wl/sys/wl_linux.c defaultn/src/wl/sys/wl_linux.c
+--- default/src/wl/sys/wl_linux.c	2026-07-22 19:44:58.046509070 +0200
++++ defaultn/src/wl/sys/wl_linux.c	2026-07-22 19:59:52.875603969 +0200
+@@ -2364,7 +2364,7 @@
+ #endif
+ ) {
+ 	wl_timer_t *t =
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 16, 0)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(6, 12, 0)
+ 		timer_container_of(t, tl, timer);
+ #elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
+ 		from_timer(t, tl, timer);
+@@ -2472,7 +2472,7 @@
+ 	ASSERT(t);
+ 	if (t->set) {
+ 		t->set = FALSE;
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 15, 0)
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0)
+ 		// Rel. commit "treewide: Switch/rename to timer_delete_sync()" (Thomas Gleixner, 5 Apr 2025)
+ 		if (!timer_delete(&t->timer)) {
+ #else

Build Results
RPM Lint

Refresh

Comments for request 6558 0

Request History

manfred-h created request 26 days ago

- Update broadcom-wl.linux-7.2.patch
- Add leap161.patch

manfred-h accepted request 26 days ago

ack