wok-current annotate broadcom-wl-pae/stuff/008-linux415.patch @ rev 25716
Adjust mesa depends and fix loop for libegl-mesa,libglx-mesa / mesa
author | Stanislas Leduc <shann@slitaz.org> |
---|---|
date | Fri Jun 14 14:46:05 2024 +0000 (3 months ago) |
parents | |
children |
rev | line source |
---|---|
shann@25643 | 1 --- a/src/wl/sys/wl_linux.c 2017-07-17 00:11:24.000000000 +0100 |
shann@25643 | 2 +++ b/src/wl/sys/wl_linux.c 2018-01-27 09:49:47.057799596 +0000 |
shann@25643 | 3 @@ -93,7 +93,11 @@ |
shann@25643 | 4 |
shann@25643 | 5 #include <wlc_wowl.h> |
shann@25643 | 6 |
shann@25643 | 7 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) |
shann@25643 | 8 +static void wl_timer(struct timer_list *tl); |
shann@25643 | 9 +#else |
shann@25643 | 10 static void wl_timer(ulong data); |
shann@25643 | 11 +#endif |
shann@25643 | 12 static void _wl_timer(wl_timer_t *t); |
shann@25643 | 13 static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); |
shann@25643 | 14 |
shann@25643 | 15 @@ -2297,10 +2301,17 @@ |
shann@25643 | 16 atomic_dec(&t->wl->callbacks); |
shann@25643 | 17 } |
shann@25643 | 18 |
shann@25643 | 19 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) |
shann@25643 | 20 +static void |
shann@25643 | 21 +wl_timer(struct timer_list *tl) |
shann@25643 | 22 +{ |
shann@25643 | 23 + wl_timer_t *t = (wl_timer_t *)tl; |
shann@25643 | 24 +#else |
shann@25643 | 25 static void |
shann@25643 | 26 wl_timer(ulong data) |
shann@25643 | 27 { |
shann@25643 | 28 wl_timer_t *t = (wl_timer_t *)data; |
shann@25643 | 29 +#endif |
shann@25643 | 30 |
shann@25643 | 31 if (!WL_ALL_PASSIVE_ENAB(t->wl)) |
shann@25643 | 32 _wl_timer(t); |
shann@25643 | 33 @@ -2352,9 +2363,13 @@ |
shann@25643 | 34 |
shann@25643 | 35 bzero(t, sizeof(wl_timer_t)); |
shann@25643 | 36 |
shann@25643 | 37 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) |
shann@25643 | 38 + timer_setup(&t->timer, wl_timer, 0); |
shann@25643 | 39 +#else |
shann@25643 | 40 init_timer(&t->timer); |
shann@25643 | 41 t->timer.data = (ulong) t; |
shann@25643 | 42 t->timer.function = wl_timer; |
shann@25643 | 43 +#endif |
shann@25643 | 44 t->wl = wl; |
shann@25643 | 45 t->fn = fn; |
shann@25643 | 46 t->arg = arg; |