Packman Build Service PMBS

File leap161.patch of Package broadcom-wl (Revision 30)

Currently displaying revision 30 , Show latest

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