[arch-commits] Commit in broadcom-wl-dkms/trunk (3 files)

[Alexander Rødseth]

    Date: Friday, December 18, 2020 @ 13:26:15
  Author: arodseth
Revision: 778598

upgpkg: broadcom-wl-dkms 6.30.223.271-24

Modified:
  broadcom-wl-dkms/trunk/PKGBUILD
  broadcom-wl-dkms/trunk/dkms.conf.in
Deleted:
  broadcom-wl-dkms/trunk/011-linux59.patch

-------------------+
 011-linux59.patch |   36 ------------------------------------
 PKGBUILD          |   14 ++++++++------
 dkms.conf.in      |    1 -
 3 files changed, 8 insertions(+), 43 deletions(-)

Deleted: 011-linux59.patch
===================================================================
--- 011-linux59.patch	2020-12-18 13:20:18 UTC (rev 778597)
+++ 011-linux59.patch	2020-12-18 13:26:15 UTC (rev 778598)
@@ -1,36 +0,0 @@
-diff -u -r a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
---- a/src/wl/sys/wl_cfg80211_hybrid.c	2015-09-18 22:47:30.000000000 +0000
-+++ b/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 a/src/wl/sys/wl_iw.c b/src/wl/sys/wl_iw.c
---- a/src/wl/sys/wl_iw.c	2015-09-18 22:47:30.000000000 +0000
-+++ b/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 a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
---- a/src/wl/sys/wl_linux.c	2020-10-12 21:19:15.256305165 +0000
-+++ b/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) {

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-18 13:20:18 UTC (rev 778597)
+++ PKGBUILD	2020-12-18 13:26:15 UTC (rev 778598)
@@ -6,7 +6,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=23
+pkgrel=24
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=(x86_64)
 url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure'
@@ -26,10 +26,9 @@
         '008-linux415.patch'
         '009-fix_mac_profile_discrepancy.patch'
         '010-linux56.patch'
-        '011-linux59.patch'
         "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283'
-            '4bcd3db9008e1bd615788a5a9c8d040d303135cb9d9ff88379a5ec32691e0573'
+            '7edf519dad569ac121996addb8cfbd513337bc5a856ac47393265d078f6e5b90'
             '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
             '4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd'
             '30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e'
@@ -40,7 +39,6 @@
             '08c24157cf3b93b60e67e600d1d90223447361990df09acfb00281d79813d167'
             '4e73e50653bb612946edd34bf31ca5a0b80f632d47a08766ae6042880927c98d'
             'f1300bcce93363088481671150ff2bbd6957e12ba11098980b9f428c7a171812'
-            '8983c8ae73ad5853a37d98aa42bed1c52a2bd27d0d4991283cf92010cab22212'
             '5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
 
 prepare() {
@@ -49,6 +47,12 @@
   sed -e "s/@PACKAGE_VERSION@/$pkgver/" dkms.conf.in > dkms.conf
   sed -n -e '/Copyright/,/SOFTWARE\./{s/^ \* //;p}' src/wl/sys/wl_linux.c
   sed -i '/GE_49 :=/s|:= .*|:= 1|' Makefile
+
+  # Changes to make this kernel module compile for Linux 5.10. Needs testing!
+  find src -type f -exec sed -i '/set_fs/d' {} \;
+  find src -type f -exec sed -i '/mm_segment_t/d' {} \;
+  sed -i 's/if (segment_eq(get_fs(), KERNEL_DS))/if (1)/' -i src/wl/sys/wl_linux.c
+  find src -type f -exec sed -i '/get_fs/d' {} \;
 }
 
 package() {
@@ -66,5 +70,3 @@
   install -Dm644 lib/LICENSE.txt \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE.shipped"
 }
-
-# vim: ts=2 sw=2 et:

Modified: dkms.conf.in
===================================================================
--- dkms.conf.in	2020-12-18 13:20:18 UTC (rev 778597)
+++ dkms.conf.in	2020-12-18 13:26:15 UTC (rev 778598)
@@ -11,5 +11,4 @@
 PATCH[6]="007-linux412.patch"
 PATCH[7]="008-linux415.patch"
 PATCH[8]="010-linux56.patch"
-PATCH[9]="011-linux59.patch"
 AUTOINSTALL="yes"