Packman Build Service PMBS

broadcom-wl.changes Changed

broadcom-wl.spec Changed

broadcom-wl.linux-4.15.patch Added

@@ -0,0 +1,54 @@
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -93,7 +93,13 @@ struct iw_statistics *wl_get_wireless_st
+ 
+ #include <wlc_wowl.h>
+ 
+-static void wl_timer(ulong data);
++static void wl_timer(
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++		struct timer_list *tl
++#else
++		ulong data
++#endif
++		);
+ static void _wl_timer(wl_timer_t *t);
+ static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
+ 
+@@ -2298,9 +2304,19 @@ wl_timer_task(wl_task_t *task)
+ }
+ 
+ static void
+-wl_timer(ulong data)
+-{
+-	wl_timer_t *t = (wl_timer_t *)data;
++wl_timer(
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++		struct timer_list *tl
++#else
++		ulong data
++#endif
++) {
++	wl_timer_t *t =
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++		from_timer(t, tl, timer);
++#else
++		(wl_timer_t *)data;
++#endif
+ 
+ 	if (!WL_ALL_PASSIVE_ENAB(t->wl))
+ 		_wl_timer(t);
+@@ -2352,9 +2368,13 @@ wl_init_timer(wl_info_t *wl, void (*fn)(
+ 
+ 	bzero(t, sizeof(wl_timer_t));
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
++	timer_setup(&t->timer, wl_timer, 0);
++#else
+ 	init_timer(&t->timer);
+ 	t->timer.data = (ulong) t;
+ 	t->timer.function = wl_timer;
++#endif
+ 	t->wl = wl;
+ 	t->fn = fn;
+ 	t->arg = arg;

Changes of Revision 10