From 76c257aa91a3657f702bd6bf1b049c1fbb367b23 Mon Sep 17 00:00:00 2001 From: Evgeny Ermakov Date: Thu, 13 Jan 2022 17:52:40 +1100 Subject: [PATCH] broadcom-wl-dkms: fix whitespace in patches --- .../broadcom-wl-dkms/patches/linux-4.15.patch | 46 +++++++++---------- .../broadcom-wl-dkms/patches/linux-5.10.patch | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch index 38f82e0deaa0..9fcd7176b50a 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/linux-4.15.patch @@ -1,44 +1,44 @@ --- 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 @@ -93,7 +93,11 @@ - - #include - + + #include + +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - static void wl_timer(ulong data); + static void wl_timer(ulong data); +#else +static void wl_timer(struct timer_list *tl); +#endif - static void _wl_timer(wl_timer_t *t); - static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); - + static void _wl_timer(wl_timer_t *t); + static struct net_device *wl_alloc_linux_if(wl_if_t *wlif); + @@ -2301,9 +2305,17 @@ - } - - static void + } + + static void +#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) - wl_timer(ulong data) + wl_timer(ulong data) +#else +wl_timer(struct timer_list *tl) +#endif - { + { +#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 + wl_timer_t *t = from_timer(t, tl, timer); +#endif - - if (!WL_ALL_PASSIVE_ENAB(t->wl)) - _wl_timer(t); + + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); @@ -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) - init_timer(&t->timer); - t->timer.data = (ulong) t; - t->timer.function = wl_timer; + init_timer(&t->timer); + t->timer.data = (ulong) t; + t->timer.function = wl_timer; +#else + timer_setup(&t->timer, wl_timer, 0); +#endif - t->wl = wl; + t->wl = wl; diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch index c52e0c36ccab..53514bf020a1 100644 --- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch +++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch @@ -117,7 +117,7 @@ diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c goto done2; } -- if (segment_eq(get_fs(), KERNEL_DS)) +- if (segment_eq(get_fs(), KERNEL_DS)) - buf = ioc.buf; - - else if (ioc.buf) {