mirror of
https://github.com/terrapkg/packages.git
synced 2026-06-02 18:02:19 +00:00
10abb8b734
* Add: broadcom-wl and wl-kmod * Fix: Built kmods without RPM Fusion deps fixed BuildRequires because actually why was it done that way * Cleanup: Removed EOL Fedora and RHEL versions from specs * Cleanup/security: Fixed more spec stuff for EOL Fedora/EL versions, removed a legacy file that if changed could result in an unbootable kernel * Fix: Use Mock Co-authored-by: madomado <madonuko@outlook.com> Signed-off-by: Gil <rockgrub@protonmail.com> * Cleanup: More removal of EOL conditions Signed-off-by: Gil <rockgrub@protonmail.com> * Cleanup: Typo Signed-off-by: Gil <rockgrub@protonmail.com> * Cleanup/security: Removed a patch related to a previously removed file that could result in an unbootable kernel --------- Signed-off-by: Gil <rockgrub@protonmail.com> Co-authored-by: madomado <madonuko@outlook.com>
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c
|
|
--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2017-06-03 15:26:57.094475000 +0200
|
|
+++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2018-02-15 00:54:30.184690464 +0100
|
|
@@ -93,7 +93,11 @@
|
|
|
|
#include <wlc_wowl.h>
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static void wl_timer(struct timer_list *tl);
|
|
+#else
|
|
static void wl_timer(ulong data);
|
|
+#endif
|
|
static void _wl_timer(wl_timer_t *t);
|
|
static struct net_device *wl_alloc_linux_if(wl_if_t *wlif);
|
|
|
|
@@ -2311,10 +2315,17 @@
|
|
atomic_dec(&t->wl->callbacks);
|
|
}
|
|
|
|
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
|
+static void
|
|
+wl_timer(struct timer_list *tl)
|
|
+{
|
|
+ wl_timer_t *t = (wl_timer_t *)tl;
|
|
+#else
|
|
static void
|
|
wl_timer(ulong data)
|
|
{
|
|
wl_timer_t *t = (wl_timer_t *)data;
|
|
+#endif
|
|
|
|
if (!WL_ALL_PASSIVE_ENAB(t->wl))
|
|
_wl_timer(t);
|
|
@@ -2366,9 +2377,13 @@
|
|
|
|
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;
|