diff -Nru bcmwl-6.30.223.271+bdcom/debian/bzr-builder.manifest bcmwl-6.30.223.271+bdcom/debian/bzr-builder.manifest --- bcmwl-6.30.223.271+bdcom/debian/bzr-builder.manifest 1970-01-01 00:00:00.000000000 +0000 +++ bcmwl-6.30.223.271+bdcom/debian/bzr-builder.manifest 2021-05-05 12:48:40.000000000 +0000 @@ -0,0 +1,2 @@ +# bzr-builder format 0.3 deb-version {debupstream}-N~12 +lp:~mmach/netext73/bcmwl-kernel-source revid:netbit73@gmail.com-20210418094147-qit3gkcahwlypp3v diff -Nru bcmwl-6.30.223.271+bdcom/debian/changelog bcmwl-6.30.223.271+bdcom/debian/changelog --- bcmwl-6.30.223.271+bdcom/debian/changelog 2021-05-05 12:50:25.000000000 +0000 +++ bcmwl-6.30.223.271+bdcom/debian/changelog 2021-05-05 12:48:40.000000000 +0000 @@ -1,27 +1,26 @@ -bcmwl (6.30.223.271+bdcom-0ubuntu8) hirsute; urgency=medium +bcmwl (6.30.223.271+bdcom-N~12~ubuntu21.10.1) impish; urgency=low - * debian/dkms.conf.in, - debian/patches/0029-Update-for-set_fs-removal-in-Linux-5.10.patch - - Add internal ioctl helper to avoid the need to use set_fs()/get_fs(), - which have been removed in Linux 5.10. + * Auto build. - -- Seth Forshee Fri, 12 Mar 2021 08:35:16 -0600 + -- NetBit73 Wed, 05 May 2021 12:48:40 +0000 -bcmwl (6.30.223.271+bdcom-0ubuntu7) groovy; urgency=medium +bcmwl (6.30.223.271+bdcom) bionic; urgency=low - * debian/patches/0028-add-support-for-linux-5.6.patch: - - Remove extra src prefix, which prevented the patch from - being applied correctly (LP: #1878045). + * Linux-5.10.x and 5.11.x compatibility. - -- Alberto Milone Fri, 02 Oct 2020 11:57:47 +0200 + -- e X t 7 3 Sat, 26 Apr 2021 17:43:08 +0000 -bcmwl (6.30.223.271+bdcom-0ubuntu6) groovy; urgency=medium +bcmwl (6.30.223.271+bdcom) bionic; urgency=low - * debian/dkms.conf.in, - debian/patches/0028-add-support-for-linux-5.6.patch (LP: #1872908): - - Add support for Linux 5.6. + * Linux-5.9.x compatibility. - -- Alberto Milone Mon, 04 May 2020 13:23:19 +0200 + -- e X t 7 3 Mon, 26 Oct 2020 21:01:01 +0000 + +bcmwl (6.30.223.271+bdcom-N~7~ubuntu18.04.1) bionic; urgency=low + + * Auto build. + + -- NetBit73 Wed, 26 Jun 2019 07:47:31 +0000 bcmwl (6.30.223.271+bdcom-0ubuntu5) eoan; urgency=medium diff -Nru bcmwl-6.30.223.271+bdcom/debian/control bcmwl-6.30.223.271+bdcom/debian/control --- bcmwl-6.30.223.271+bdcom/debian/control 2021-05-05 12:50:25.000000000 +0000 +++ bcmwl-6.30.223.271+bdcom/debian/control 2021-05-05 12:48:40.000000000 +0000 @@ -1,8 +1,8 @@ Source: bcmwl Section: admin Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Alberto Milone +Maintainer: e X t 7 3 | NeteXt'73 Team | netext73.pl +Uploaders: e X t 7 3 | NeteXt'73 Team | netext73.pl, Standards-Version: 3.9.1 Build-Depends: debhelper (>= 7.0.50~), dh-modaliases diff -Nru 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 2021-05-05 12:50:25.000000000 +0000 +++ bcmwl-6.30.223.271+bdcom/debian/dkms.conf.in 2021-05-05 12:48:40.000000000 +0000 @@ -19,6 +19,7 @@ PATCH[11]="0026-add-support-for-Linux-4.15.patch" PATCH[12]="0027-add-support-for-linux-5.1.patch" PATCH[13]="0028-add-support-for-linux-5.6.patch" +#PATCH[14]="broadcom-wl-fix-linux-5-9.patch" PATCH[14]="0029-Update-for-set_fs-removal-in-Linux-5.10.patch" #PATCH_MATCH[6]="^3.[10-11]" AUTOINSTALL="yes" diff -Nru bcmwl-6.30.223.271+bdcom/debian/patches/0028-add-support-for-linux-5.6.patch bcmwl-6.30.223.271+bdcom/debian/patches/0028-add-support-for-linux-5.6.patch --- bcmwl-6.30.223.271+bdcom/debian/patches/0028-add-support-for-linux-5.6.patch 2021-05-05 12:50:25.000000000 +0000 +++ bcmwl-6.30.223.271+bdcom/debian/patches/0028-add-support-for-linux-5.6.patch 2021-05-05 12:48:40.000000000 +0000 @@ -1,81 +1,59 @@ -From 03dc9777612be477618f14bf600538f1eb96c0df Mon Sep 17 00:00:00 2001 -From: Alberto Milone -Date: Mon, 4 May 2020 13:17:19 +0200 -Subject: [PATCH 1/1] Add support for linux 5.6 - -Original patch: -https://git.archlinux.org/svntogit/community.git/commit/trunk?h=packages/broadcom-wl-dkms&id=e78ab887e946418baac2abcaad24b9df19f22945 - -Signed-off-by: Alberto Milone ---- - src/shared/linux_osl.c | 4 ++++ - src/wl/sys/wl_linux.c | 15 +++++++++++++++ - 2 files changed, 19 insertions(+) - -diff --git a/src/shared/linux_osl.c b/src/shared/linux_osl.c -index 6157d18..c6d1aed 100644 ---- a/src/shared/linux_osl.c -+++ b/src/shared/linux_osl.c -@@ -942,7 +942,11 @@ osl_getcycles(void) +diff -Naur a/src/shared/linux_osl.c b/src/shared/linux_osl.c +--- a/src/shared/linux_osl.c 2019-01-26 19:33:46.518389000 +0100 ++++ b/src/shared/linux_osl.c 2020-03-19 10:16:53.597986455 +0100 +@@ -946,7 +946,11 @@ void * osl_reg_map(uint32 pa, uint size) { -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+ return (ioremap((unsigned long)pa, (unsigned long)size)); -+#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) return (ioremap_nocache((unsigned long)pa, (unsigned long)size)); -+#endif ++#else ++ return (ioremap((unsigned long)pa, (unsigned long)size)); ++#endif } - + void -diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c -index 0d05100..8aa60f4 100644 ---- a/src/wl/sys/wl_linux.c -+++ b/src/wl/sys/wl_linux.c -@@ -582,7 +582,11 @@ wl_attach(uint16 vendor, uint16 device, ulong regs, +diff -Naur a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +--- a/src/wl/sys/wl_linux.c 2018-04-18 13:53:37.484164000 +0200 ++++ b/src/wl/sys/wl_linux.c 2020-03-19 10:24:18.154395810 +0100 +@@ -586,7 +586,11 @@ } wl->bcm_bustype = bustype; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { -+#else + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) if ((wl->regsva = ioremap_nocache(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { -+#endif ++#else ++ if ((wl->regsva = ioremap(dev->base_addr, PCI_BAR0_WINSZ)) == NULL) { ++#endif WL_ERROR(("wl%d: ioremap() failed\n", unit)); goto fail; } -@@ -772,7 +776,11 @@ wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -772,7 +776,11 @@ if ((val & 0x0000ff00) != 0) pci_write_config_dword(pdev, 0x40, val & 0xffff00ff); bar1_size = pci_resource_len(pdev, 2); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), -+#else ++ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) bar1_addr = (uchar *)ioremap_nocache(pci_resource_start(pdev, 2), -+#endif ++ #else ++ bar1_addr = (uchar *)ioremap(pci_resource_start(pdev, 2), ++ #endif bar1_size); wl = wl_attach(pdev->vendor, pdev->device, pci_resource_start(pdev, 0), PCI_BUS, pdev, pdev->irq, bar1_addr, bar1_size); -@@ -3335,12 +3343,19 @@ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t +@@ -3335,10 +3343,16 @@ } - + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0) -+static struct proc_ops wl_fops = { -+ .proc_read = wl_proc_read, -+ .proc_write = wl_proc_write, -+}; -+#else ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) static const struct file_operations wl_fops = { .owner = THIS_MODULE, .read = wl_proc_read, .write = wl_proc_write, ++#else ++static const struct proc_ops wl_fops = { ++ .proc_read = wl_proc_read, ++ .proc_write = wl_proc_write, ++#endif }; #endif -+#endif - - static int - wl_reg_proc_entry(wl_info_t *wl) --- -2.25.1 - + diff -Nru bcmwl-6.30.223.271+bdcom/debian/patches/broadcom-wl-fix-linux-5-9-patch bcmwl-6.30.223.271+bdcom/debian/patches/broadcom-wl-fix-linux-5-9-patch --- bcmwl-6.30.223.271+bdcom/debian/patches/broadcom-wl-fix-linux-5-9-patch 1970-01-01 00:00:00.000000000 +0000 +++ bcmwl-6.30.223.271+bdcom/debian/patches/broadcom-wl-fix-linux-5-9-patch 2021-05-05 12:48:40.000000000 +0000 @@ -0,0 +1,18 @@ +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 0d05100..4be2189 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -1643,7 +1643,11 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) + goto done2; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) + if (segment_eq(get_fs(), KERNEL_DS)) ++#else ++ if (uaccess_kernel()) ++#endif + buf = ioc.buf; + + else if (ioc.buf) { +-- +2.28.0 diff -Nru bcmwl-6.30.223.271+bdcom/debian/patches/broadcom-wl-fix-linux-5-9.patch bcmwl-6.30.223.271+bdcom/debian/patches/broadcom-wl-fix-linux-5-9.patch --- bcmwl-6.30.223.271+bdcom/debian/patches/broadcom-wl-fix-linux-5-9.patch 1970-01-01 00:00:00.000000000 +0000 +++ bcmwl-6.30.223.271+bdcom/debian/patches/broadcom-wl-fix-linux-5-9.patch 2021-05-05 12:48:40.000000000 +0000 @@ -0,0 +1,18 @@ +diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c +index 0d05100..4be2189 100644 +--- a/src/wl/sys/wl_linux.c ++++ b/src/wl/sys/wl_linux.c +@@ -1643,7 +1643,11 @@ wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) + goto done2; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 9, 0) + if (segment_eq(get_fs(), KERNEL_DS)) ++#else ++ if (uaccess_kernel()) ++#endif + buf = ioc.buf; + + else if (ioc.buf) { +-- +2.28.0