diff -u bcmwl-6.30.223.271+bdcom/debian/changelog bcmwl-6.30.223.271+bdcom/debian/changelog --- bcmwl-6.30.223.271+bdcom/debian/changelog +++ bcmwl-6.30.223.271+bdcom/debian/changelog @@ -1,3 +1,12 @@ +bcmwl (6.30.223.271+bdcom-0ubuntu1~1.3) xenial; urgency=medium + + * debian/dkms.conf.in, (LP: #1777646) + debian/patches/0025-add-support-for-linux-4.14.patch: + debian/patches/0026-add-support-for-linux-4.15.patch: + - Add support for Linux 4.15. + + -- Marcelo Henrique Cerri Tue, 19 Jun 2018 09:50:20 -0300 + bcmwl (6.30.223.271+bdcom-0ubuntu1~1.2) xenial; urgency=medium * debian/dkms.conf.in, diff -u bcmwl-6.30.223.271+bdcom/debian/dkms.conf.in bcmwl-6.30.223.271+bdcom/debian/dkms.conf.in --- bcmwl-6.30.223.271+bdcom/debian/dkms.conf.in +++ bcmwl-6.30.223.271+bdcom/debian/dkms.conf.in @@ -16,4 +16,6 @@ PATCH[8]="0023-add-support-for-Linux-4.11.patch" PATCH[9]="0024-add-support-for-Linux-4.12.patch" +PATCH[10]="0025-add-support-for-Linux-4.14.patch" +PATCH[11]="0026-add-support-for-Linux-4.15.patch" #PATCH_MATCH[6]="^3.[10-11]" AUTOINSTALL="yes" only in patch2: unchanged: --- bcmwl-6.30.223.271+bdcom.orig/debian/patches/0025-add-support-for-Linux-4.14.patch +++ bcmwl-6.30.223.271+bdcom/debian/patches/0025-add-support-for-Linux-4.14.patch @@ -0,0 +1,29 @@ +From d1dfd471bfc5bb4e9513e8a26ecb11de934dc27e Mon Sep 17 00:00:00 2001 +From: Marcelo Henrique Cerri +Date: Fri, 15 Dec 2017 17:09:04 +0000 +Subject: [PATCH 25/26] add support for Linux 4.14 + +Signed-off-by: Marcelo Henrique Cerri +--- + src/shared/linux_osl.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c +index 6157d1832767..318874541d89 100644 +--- a/src/shared/linux_osl.c ++++ b/src/shared/linux_osl.c +@@ -1076,7 +1076,11 @@ osl_os_get_image_block(char *buf, int len, void *image) + if (!image) + return 0; + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 14, 0) ++ rdlen = kernel_read(fp, buf, len, &fp->f_pos); ++#else + rdlen = kernel_read(fp, fp->f_pos, buf, len); ++#endif + if (rdlen > 0) + fp->f_pos += rdlen; + +-- +2.14.1 + only in patch2: unchanged: --- bcmwl-6.30.223.271+bdcom.orig/debian/patches/0026-add-support-for-Linux-4.15.patch +++ bcmwl-6.30.223.271+bdcom/debian/patches/0026-add-support-for-Linux-4.15.patch @@ -0,0 +1,61 @@ +From cd39fb95882ca7707946848f7dc24d4e2915dbf5 Mon Sep 17 00:00:00 2001 +From: Marcelo Henrique Cerri +Date: Fri, 15 Dec 2017 18:09:01 +0000 +Subject: [PATCH 26/26] add support for Linux 4.15 + +Signed-off-by: Marcelo Henrique Cerri +--- + src/wl/sys/wl_linux.c | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 0d05100cfac7..165ea7c64c86 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -93,7 +93,11 @@ struct iw_statistics *wl_get_wireless_stats(struct net_device *dev); + + #include + ++#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); + +@@ -2298,9 +2302,17 @@ wl_timer_task(wl_task_t *task) + } + + static void ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++wl_timer(struct timer_list *tl) ++#else + wl_timer(ulong data) ++#endif + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) ++ wl_timer_t *t = from_timer(t, tl, timer); ++#else + wl_timer_t *t = (wl_timer_t *)data; ++#endif + + if (!WL_ALL_PASSIVE_ENAB(t->wl)) + _wl_timer(t); +@@ -2352,9 +2364,13 @@ wl_init_timer(wl_info_t *wl, void (*fn)(void *arg), void *arg, const char *tname + + 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; +-- +2.14.1 +