Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=kernelbump.git;a=commitdiff;h=9c9e29e5183fd9dec2200f1bdee08d24e4a2b11b
commit 9c9e29e5183fd9dec2200f1bdee08d24e4a2b11b Author: DeX77 <[email protected]> Date: Wed Jan 31 22:13:25 2018 +0100 bcmwl-6.30.223.271-109-x86_64 * fix build with kernel 4.15 diff --git a/source/network-extra/bcmwl/FrugalBuild b/source/network-extra/bcmwl/FrugalBuild index 053beb1..b21362c 100644 --- a/source/network-extra/bcmwl/FrugalBuild +++ b/source/network-extra/bcmwl/FrugalBuild @@ -19,14 +19,18 @@ source=(https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_6 linux-4.7.patch \ linux-4.8.patch \ linux-4.11.patch \ - linux-4.12.patch ) + linux-4.12.patch \ + linux-4.14.patch \ + linux-4.15.patch) sha1sums=('1f568bb989d175813c5631c6629d9479eae6f3be' \ 'a37c5dd9ab279372f0c68595bb2a8f1fe694cd13' \ 'b400d4eb8a531c7329a28f2be4ce3b4bd37e1d56' \ '95243e5fcd9b32459c9a945f1b0ac217dab1755a' \ 'c0447fa30afc7091261fa5aa497135815ef2e70d' \ '7496ccd8212198a3f76cc2c34c874e7108efe200' \ - '1d3fb939df5ba3b04e2949df6c5ed24f4a3d1f48') + '1d3fb939df5ba3b04e2949df6c5ed24f4a3d1f48' \ + '408b03d5c4756dabe7b50143243eba48d8b38cf9' \ + '643726f857cf05ccfde0d9be2ef56669c4803b9f') build() { diff --git a/source/network-extra/bcmwl/linux-4.14.patch b/source/network-extra/bcmwl/linux-4.14.patch new file mode 100644 index 0000000..36a65ef --- /dev/null +++ b/source/network-extra/bcmwl/linux-4.14.patch @@ -0,0 +1,25 @@ +--- src/shared/linux_osl.c 2017-12-29 22:59:17.000000000 -0400 ++++ /src/shared/linux_osl.c 2017-12-29 23:44:24.786247269 -0400 +@@ -1076,11 +1076,21 @@ + { + struct file *fp = (struct file *)image; + int rdlen; ++ loff_t pos; + + if (!image) + return 0; + +- rdlen = kernel_read(fp, fp->f_pos, buf, len); ++ pos = fp->f_pos; ++ rdlen = kernel_read(fp, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0) ++ pos, ++#endif ++ buf, len ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++ ,&pos ++#endif ++ ); + if (rdlen > 0) + fp->f_pos += rdlen; + diff --git a/source/network-extra/bcmwl/linux-4.15.patch b/source/network-extra/bcmwl/linux-4.15.patch new file mode 100644 index 0000000..5f4b9b1 --- /dev/null +++ b/source/network-extra/bcmwl/linux-4.15.patch @@ -0,0 +1,54 @@ +--- src/wl/sys/wl_linux.c 2017-12-29 23:57:29.000000000 -0400 ++++ src/wl/sys/wl_linux.c 2017-12-30 12:32:29.518324068 -0400 +@@ -93,7 +93,13 @@ + + #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); + +@@ -2295,9 +2301,19 @@ + } + + 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); +@@ -2349,9 +2365,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; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
