jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

broadcom-wl-dkms: fix whitespace in patches

Browse source
This commit is contained in:
Evgeny Ermakov 2022-01-13 17:52:40 +11:00 committed by Érico Nogueira Rolim
parent 9a8ed3e07f
commit 77395b768c
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch
View file

@ -1,44 +1,44 @@
--- a/src/wl/sys/wl_linux.c 2018-01-31 11:33:26.000000000 +0100 --- a/src/wl/sys/wl_linux.c 2018-01-31 11:33:26.000000000 +0100
+++ b/src/wl/sys/wl_linux.c 2018-01-31 15:27:18.000000000 +0100 +++ b/src/wl/sys/wl_linux.c 2018-01-31 15:27:18.000000000 +0100
@@ -93,7 +93,11 @@ @@ -93,7 +93,11 @@
#include <wlc_wowl.h> #include <wlc_wowl.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
static void wl_timer(ulong data); static void wl_timer(ulong data);
+#else +#else
+static void wl_timer(struct timer_list *tl); +static void wl_timer(struct timer_list *tl);
+#endif +#endif
static void _wl_timer(wl_timer_t *t); static void _wl_timer(wl_timer_t *t);
static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
@@ -2301,9 +2305,17 @@ @@ -2301,9 +2305,17 @@
} }
static void static void
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
wl_timer(ulong data) wl_timer(ulong data)
+#else +#else
+wl_timer(struct timer_list *tl) +wl_timer(struct timer_list *tl)
+#endif +#endif
{ {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
wl_timer_t *t = (wl_timer_t *)data; wl_timer_t *t = (wl_timer_t *)data;
+#else +#else
+ wl_timer_t *t = from_timer(t, tl, timer); + wl_timer_t *t = from_timer(t, tl, timer);
+#endif +#endif
if (!WL_ALL_PASSIVE_ENAB(t->wl)) if (!WL_ALL_PASSIVE_ENAB(t->wl))
_wl_timer(t); _wl_timer(t);
@@ -2355,7 +2367,11 @@ @@ -2355,7 +2367,11 @@
bzero(t, sizeof(wl_timer_t)); bzero(t, sizeof(wl_timer_t));
+#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
init_timer(&t->timer); init_timer(&t->timer);
t->timer.data = (ulong) t; t->timer.data = (ulong) t;
t->timer.function = wl_timer; t->timer.function = wl_timer;
+#else +#else
+ timer_setup(&t->timer, wl_timer, 0); + timer_setup(&t->timer, wl_timer, 0);
+#endif +#endif
t->wl = wl; t->wl = wl;

2
srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
View file

@ -117,7 +117,7 @@ diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
goto done2; goto done2;
} }
- if (segment_eq(get_fs(), KERNEL_DS)) - if (segment_eq(get_fs(), KERNEL_DS))
- buf = ioc.buf; - buf = ioc.buf;
- -
- else if (ioc.buf) { - else if (ioc.buf) {