[PR PATCH] broadcom-wl-dkms: add linux-5.9.patch

[PR PATCH] broadcom-wl-dkms: add linux-5.9.patch

[deepcube]

[-- Attachment #1: Type: text/plain, Size: 546 bytes --]

There is a new pull request by deepcube against master on the void-packages repository

https://github.com/deepcube/void-packages emg-broadcom-wl-dkms-linux-5.9
https://github.com/void-linux/void-packages/pull/27202

broadcom-wl-dkms: add linux-5.9.patch
Linux 5.9 broke broadcom-wl-dkms.  Add patch[0] from archlinux package
to fix.

[0] https://raw.githubusercontent.com/archlinux/svntogit-community/packages/broadcom-wl-dkms/trunk/011-linux59.patch

A patch file from https://github.com/void-linux/void-packages/pull/27202.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-emg-broadcom-wl-dkms-linux-5.9-27202.patch --]
[-- Type: text/x-diff, Size: 2518 bytes --]

From 59cad5c56b756243d912ba62701f1abb9f97753d Mon Sep 17 00:00:00 2001
From: Evan Gates <evan.gates@gmail.com>
Date: Wed, 16 Dec 2020 10:52:08 -0800
Subject: [PATCH] broadcom-wl-dkms: add linux-5.9.patch

Linux 5.9 broke broadcom-wl-dkms.  Add patch[0] from archlinux package
to fix.

[0] https://raw.githubusercontent.com/archlinux/svntogit-community/packages/broadcom-wl-dkms/trunk/011-linux59.patch
---
 .../broadcom-wl-dkms/patches/linux-5.9.patch  | 36 +++++++++++++++++++
 srcpkgs/broadcom-wl-dkms/template             |  2 +-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch

diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
new file mode 100644
index 00000000000..c0af5c181dd
--- /dev/null
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
@@ -0,0 +1,36 @@
+diff -u -r src/wl/sys/wl_cfg80211_hybrid.c src/wl/sys/wl_cfg80211_hybrid.c
+--- src/wl/sys/wl_cfg80211_hybrid.c	2015-09-18 22:47:30.000000000 +0000
++++ src/wl/sys/wl_cfg80211_hybrid.c	2020-10-12 21:20:05.200372484 +0000
+@@ -450,7 +450,7 @@
+ 	ifr.ifr_data = (caddr_t)&ioc;
+ 
+ 	fs = get_fs();
+-	set_fs(get_ds());
++	set_fs(KERNEL_DS);
+ #if defined(WL_USE_NETDEV_OPS)
+ 	err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
+diff -u -r src/wl/sys/wl_iw.c src/wl/sys/wl_iw.c
+--- src/wl/sys/wl_iw.c	2015-09-18 22:47:30.000000000 +0000
++++ src/wl/sys/wl_iw.c	2020-10-12 21:19:51.426836804 +0000
+@@ -117,7 +117,7 @@
+ 	ifr.ifr_data = (caddr_t) &ioc;
+ 
+ 	fs = get_fs();
+-	set_fs(get_ds());
++	set_fs(KERNEL_DS);
+ #if defined(WL_USE_NETDEV_OPS)
+ 	ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+ #else
+diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
+--- src/wl/sys/wl_linux.c	2020-10-12 21:19:15.256305165 +0000
++++ src/wl/sys/wl_linux.c	2020-10-12 21:20:38.687530895 +0000
+@@ -1643,7 +1643,7 @@
+ 		goto done2;
+ 	}
+ 
+-	if (segment_eq(get_fs(), KERNEL_DS))
++	if (get_fs().seg == KERNEL_DS.seg)
+ 		buf = ioc.buf;
+ 
+ 	else if (ioc.buf) {
diff --git a/srcpkgs/broadcom-wl-dkms/template b/srcpkgs/broadcom-wl-dkms/template
index 43711032f87..59a0df64183 100644
--- a/srcpkgs/broadcom-wl-dkms/template
+++ b/srcpkgs/broadcom-wl-dkms/template
@@ -2,7 +2,7 @@
 
 pkgname=broadcom-wl-dkms
 version=6.30.223.271
-revision=9
+revision=10
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="custom:Proprietary Broadcom license"
 homepage="http://broadcom.com"

Re: broadcom-wl-dkms: add linux-5.9.patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27202#issuecomment-747452163

Comment:
Does this still work with older kernels?

Re: broadcom-wl-dkms: add linux-5.9.patch

[deepcube]

[-- Attachment #1: Type: text/plain, Size: 851 bytes --]

New comment by deepcube on void-packages repository

https://github.com/void-linux/void-packages/pull/27202#issuecomment-747592340

Comment:
On Thu Dec 17, 2020 at 5:54 AM PST, Érico Nogueira Rolim wrote:
> Does this still work with older kernels?

Yes.

I have performed a minimal test on the 5.8 and LTS kernels (5.4, 4.19,
4.9, 4.4).  For all of them the driver builds, probes, the interface
appears, and I can pass traffic.

For this change:

	-	if (segment_eq(get_fs(), KERNEL_DS))
	+	if (get_fs().seg == KERNEL_DS.seg)

The segment_eq macro was:

	#define segment_eq(a, b) ((a).seg == (b).seg)

So the new code is just expanding that manually.

I will admit I'm not as clear on this change:

	-	set_fs(get_ds());
	+	set_fs(KERNEL_DS);

But my hunch is that it's acceptable as the earlier block was already
using KERNEL_DS instead of get_ds().

Re: broadcom-wl-dkms: add linux-5.9.patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 158 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/27202#issuecomment-747602865

Comment:
Great, thank you!

Re: [PR PATCH] [Merged]: broadcom-wl-dkms: add linux-5.9.patch

[ericonr]

[-- Attachment #1: Type: text/plain, Size: 370 bytes --]

There's a merged pull request on the void-packages repository

broadcom-wl-dkms: add linux-5.9.patch
https://github.com/void-linux/void-packages/pull/27202

Description:
Linux 5.9 broke broadcom-wl-dkms.  Add patch[0] from archlinux package
to fix.

[0] https://raw.githubusercontent.com/archlinux/svntogit-community/packages/broadcom-wl-dkms/trunk/011-linux59.patch