From: ibhagwan <ibhagwan@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] broadcom-wl-dkms: patch for kernel 5.10
Date: Wed, 27 Jan 2021 23:19:27 +0100 [thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28275@inbox.vuxu.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 690 bytes --]
There is a new pull request by ibhagwan against master on the void-packages repository
https://github.com/ibhagwan/void-packages broadcom-wl-dkms-linux-5.10
https://github.com/void-linux/void-packages/pull/28275
broadcom-wl-dkms: patch for kernel 5.10
linux-5.10 kernel broke `broadcom-wl-dkms`, added [this patch](https://gist.github.com/joanbm/5c640ac074d27fd1d82c74a5b67a1290) to make it work.
Also removed the `linux-5.9.patch` as it is now redundant (included in the 5.10 patch) and also creates a conflict since the patches are executed alphabetically (i.e. 5.9 is applied after 5.10).
A patch file from https://github.com/void-linux/void-packages/pull/28275.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-broadcom-wl-dkms-linux-5.10-28275.patch --]
[-- Type: text/x-diff, Size: 7446 bytes --]
From 8b2b49b32f547578f54cd3d703fd7bba6218471b Mon Sep 17 00:00:00 2001
From: bhagwan <bhagwan@disroot.org>
Date: Wed, 27 Jan 2021 13:59:23 -0800
Subject: [PATCH] broadcom-wl-dkms patch for kernel 5.10
---
.../broadcom-wl-dkms/patches/linux-5.10.patch | 179 ++++++++++++++++++
.../broadcom-wl-dkms/patches/linux-5.9.patch | 36 ----
srcpkgs/broadcom-wl-dkms/template | 2 +-
3 files changed, 180 insertions(+), 37 deletions(-)
create mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
delete mode 100644 srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
new file mode 100644
index 00000000000..429db60e730
--- /dev/null
+++ b/srcpkgs/broadcom-wl-dkms/patches/linux-5.10.patch
@@ -0,0 +1,179 @@
+diff -u -r src/wl/sys/wl_cfg80211_hybrid.c src/wl/sys/wl_cfg80211_hybrid.c
+--- src/wl/sys/wl_cfg80211_hybrid.c 2021-01-25 08:55:05.625224400 -0800
++++ src/wl/sys/wl_cfg80211_hybrid.c 2021-01-25 08:58:30.000982902 -0800
+@@ -41,6 +41,7 @@
+ #include <wlioctl.h>
+ #include <proto/802.11.h>
+ #include <wl_cfg80211_hybrid.h>
++#include <wl_linux.h>
+
+ #define EVENT_TYPE(e) dtoh32((e)->event_type)
+ #define EVENT_FLAGS(e) dtoh16((e)->flags)
+@@ -446,30 +447,8 @@
+ static s32
+ wl_dev_ioctl(struct net_device *dev, u32 cmd, void *arg, u32 len)
+ {
+- struct ifreq ifr;
+- struct wl_ioctl ioc;
+- mm_segment_t fs;
+- s32 err = 0;
+-
+ BUG_ON(len < sizeof(int));
+-
+- memset(&ioc, 0, sizeof(ioc));
+- ioc.cmd = cmd;
+- ioc.buf = arg;
+- ioc.len = len;
+- strcpy(ifr.ifr_name, dev->name);
+- ifr.ifr_data = (caddr_t)&ioc;
+-
+- fs = get_fs();
+- set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+- err = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+- err = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+- set_fs(fs);
+-
+- return err;
++ return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+
+ static s32
+diff -u -r src/wl/sys/wl_iw.c src/wl/sys/wl_iw.c
+--- src/wl/sys/wl_iw.c 2021-01-25 09:00:13.163543809 -0800
++++ src/wl/sys/wl_iw.c 2021-01-25 09:02:04.218646005 -0800
+@@ -37,6 +37,7 @@
+
+ #include <wl_dbg.h>
+ #include <wl_iw.h>
++#include <wl_linux.h>
+
+ extern bool wl_iw_conn_status_str(uint32 event_type, uint32 status,
+ uint32 reason, char* stringBuf, uint buflen);
+@@ -106,29 +107,7 @@
+ int len
+ )
+ {
+- struct ifreq ifr;
+- wl_ioctl_t ioc;
+- mm_segment_t fs;
+- int ret;
+-
+- memset(&ioc, 0, sizeof(ioc));
+- ioc.cmd = cmd;
+- ioc.buf = arg;
+- ioc.len = len;
+-
+- strcpy(ifr.ifr_name, dev->name);
+- ifr.ifr_data = (caddr_t) &ioc;
+-
+- fs = get_fs();
+- set_fs(get_ds());
+-#if defined(WL_USE_NETDEV_OPS)
+- ret = dev->netdev_ops->ndo_do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#else
+- ret = dev->do_ioctl(dev, &ifr, SIOCDEVPRIVATE);
+-#endif
+- set_fs(fs);
+-
+- return ret;
++ return wlc_ioctl_internal(dev, cmd, arg, len);
+ }
+
+ static int
+diff -u -r src/wl/sys/wl_linux.c src/wl/sys/wl_linux.c
+--- src/wl/sys/wl_linux.c 2021-01-25 09:02:08.055475147 -0800
++++ src/wl/sys/wl_linux.c 2021-01-25 09:06:11.894764339 -0800
+@@ -1650,10 +1650,7 @@
+ goto done2;
+ }
+
+- if (segment_eq(get_fs(), KERNEL_DS))
+- buf = ioc.buf;
+-
+- else if (ioc.buf) {
++ if (ioc.buf) {
+ if (!(buf = (void *) MALLOC(wl->osh, MAX(ioc.len, WLC_IOCTL_MAXLEN)))) {
+ bcmerror = BCME_NORESOURCE;
+ goto done2;
+@@ -1674,7 +1671,7 @@
+ WL_UNLOCK(wl);
+
+ done1:
+- if (ioc.buf && (ioc.buf != buf)) {
++ if (ioc.buf) {
+ if (copy_to_user(ioc.buf, buf, ioc.len))
+ bcmerror = BCME_BADADDR;
+ MFREE(wl->osh, buf, MAX(ioc.len, WLC_IOCTL_MAXLEN));
+@@ -1684,6 +1681,39 @@
+ ASSERT(VALID_BCMERROR(bcmerror));
+ if (bcmerror != 0)
+ wl->pub->bcmerror = bcmerror;
++ return (OSL_ERROR(bcmerror));
++}
++
++int
++wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len)
++{
++ wl_info_t *wl;
++ wl_if_t *wlif;
++ int bcmerror;
++
++ if (!dev)
++ return -ENETDOWN;
++
++ wl = WL_INFO(dev);
++ wlif = WL_DEV_IF(dev);
++ if (wlif == NULL || wl == NULL || wl->dev == NULL)
++ return -ENETDOWN;
++
++ bcmerror = 0;
++
++ WL_TRACE(("wl%d: wlc_ioctl_internal: cmd 0x%x\n", wl->pub->unit, cmd));
++
++ WL_LOCK(wl);
++ if (!capable(CAP_NET_ADMIN)) {
++ bcmerror = BCME_EPERM;
++ } else {
++ bcmerror = wlc_ioctl(wl->wlc, cmd, buf, len, wlif->wlcif);
++ }
++ WL_UNLOCK(wl);
++
++ ASSERT(VALID_BCMERROR(bcmerror));
++ if (bcmerror != 0)
++ wl->pub->bcmerror = bcmerror;
+ return (OSL_ERROR(bcmerror));
+ }
+
+diff -u -r src/wl/sys/wl_linux.h src/wl/sys/wl_linux.h
+--- src/wl/sys/wl_linux.h 2021-01-25 09:06:15.188672391 -0800
++++ src/wl/sys/wl_linux.h 2021-01-25 09:07:49.457810535 -0800
+@@ -29,6 +29,7 @@
+ #define _wl_linux_h_
+
+ #include <wlc_types.h>
++#include <wlc_pub.h>
+
+ typedef struct wl_timer {
+ struct timer_list timer;
+@@ -194,6 +195,7 @@
+ extern int __devinit wl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent);
+ extern void wl_free(wl_info_t *wl);
+ extern int wl_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd);
++extern int wlc_ioctl_internal(struct net_device *dev, int cmd, void *buf, int len);
+ extern struct net_device * wl_netdev_get(wl_info_t *wl);
+
+ #endif
+diff -u -r src/wl/sys/wlc_pub.h src/wl/sys/wlc_pub.h
+--- src/wl/sys/wlc_pub.h 2021-01-25 09:07:54.543645032 -0800
++++ src/wl/sys/wlc_pub.h 2021-01-25 09:08:10.772110464 -0800
+@@ -24,6 +24,7 @@
+
+ #include <wlc_types.h>
+ #include <wlc_utils.h>
++#include <siutils.h>
+ #include "proto/802.11.h"
+ #include "proto/bcmevent.h"
+
diff --git a/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch b/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
deleted file mode 100644
index c0af5c181dd..00000000000
--- a/srcpkgs/broadcom-wl-dkms/patches/linux-5.9.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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 59a0df64183..55bc9c0e1d3 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=10
+revision=11
maintainer="Orphaned <orphan@voidlinux.org>"
license="custom:Proprietary Broadcom license"
homepage="http://broadcom.com"
next reply other threads:[~2021-01-27 22:19 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-27 22:19 ibhagwan [this message]
2021-01-28 1:46 ` abenson
2021-01-28 1:47 ` abenson
2021-01-28 2:08 ` [PR PATCH] [Updated] " ibhagwan
2021-01-28 2:09 ` ibhagwan
2021-01-29 14:19 ` [PR PATCH] [Merged]: " abenson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-28275@inbox.vuxu.org \
--to=ibhagwan@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).