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

[Jan Steffens]

    Date: Wednesday, March 23, 2022 @ 00:47:47
  Author: heftig
Revision: 1171161

6.30.223.271-29: add patch for linux 5.17

Added:
  broadcom-wl-dkms/trunk/012-linux517.patch
Modified:
  broadcom-wl-dkms/trunk/PKGBUILD
  broadcom-wl-dkms/trunk/dkms.conf.in

--------------------+
 012-linux517.patch |   39 +++++++++++++++++++++++++++++++++++++++
 PKGBUILD           |    6 ++++--
 dkms.conf.in       |    1 +
 3 files changed, 44 insertions(+), 2 deletions(-)

Added: 012-linux517.patch
===================================================================
--- 012-linux517.patch	                        (rev 0)
+++ 012-linux517.patch	2022-03-23 00:47:47 UTC (rev 1171161)
@@ -0,0 +1,39 @@
+diff -u -r a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+--- a/src/wl/sys/wl_linux.c	2022-03-23 00:35:42.930416350 +0000
++++ b/src/wl/sys/wl_linux.c	2022-03-23 00:40:12.903771013 +0000
+@@ -2980,7 +2980,11 @@
+ 	else
+ 		dev->type = ARPHRD_IEEE80211_RADIOTAP;
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ 	bcopy(wl->dev->dev_addr, dev->dev_addr, ETHER_ADDR_LEN);
++#else
++	eth_hw_addr_set(wl->dev, dev->dev_addr);
++#endif
+ 
+ #if defined(WL_USE_NETDEV_OPS)
+ 	dev->netdev_ops = &wl_netdev_monitor_ops;
+@@ -3261,7 +3265,11 @@
+ static ssize_t
+ wl_proc_read(struct file *filp, char __user *buffer, size_t length, loff_t *offp)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ 	wl_info_t * wl = PDE_DATA(file_inode(filp));
++#else
++	wl_info_t * wl = pde_data(file_inode(filp));
++#endif
+ #endif
+ 	int bcmerror, len;
+ 	int to_user = 0;
+@@ -3318,7 +3326,11 @@
+ static ssize_t
+ wl_proc_write(struct file *filp, const char __user *buff, size_t length, loff_t *offp)
+ {
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+ 	wl_info_t * wl = PDE_DATA(file_inode(filp));
++#else
++	wl_info_t * wl = pde_data(file_inode(filp));
++#endif
+ #endif
+ 	int from_user = 0;
+ 	int bcmerror;

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-23 00:40:14 UTC (rev 1171160)
+++ PKGBUILD	2022-03-23 00:47:47 UTC (rev 1171161)
@@ -6,7 +6,7 @@
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=28
+pkgrel=29
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=(x86_64)
 url='https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure'
@@ -27,9 +27,10 @@
         '009-fix_mac_profile_discrepancy.patch'
         '010-linux56.patch'
         '011-linux59.patch'
+        '012-linux517.patch'
         "https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 b2sums=('7c4eaa825a37358509a08e5105665eeabc9f097945b6fa163cd5722b00638da5889f5466bd2c5f1b01172f2d0c9fb195f6e18329f2880adb2774406684cbc4c0'
-        '07ed5e7771e363628fa2cadb12fb0801162c533802590d969bd6e3438c42fc2fc4523653b1fd8e19fd7a4f5cc82e26c2a7a8a0c8b81dbc4dce42cf79d5d9904f'
+        '662adcf24effdeedb8a9108759ae7710466563ebede29c0e769078db3084fc03d74557e705ec13454faef74ad665d1a9a8f9c50c1e1512f525e06ca7b4268063'
         '038150b9a50025dbd3c81d09755956216b83c0b54db29dc4bfbc3b46bd67cf4640ad643d69ba7f8d486f52cedeb00929b97e02152e72404e6126a05855f97d6f'
         'bbc80e1ac01683ccc2d940212347fc11c74bdc252d492ca79a292015ac25df6a153ac97cb6c0f0a8d51c1c33d5dc0de4fdd61b1958499b946dc817d29646b72f'
         'ecf3eb75f8eb3331b0a36b39851536de43cffd3b303db9e9f4fe6fe55d463c3343aba17a99668448427764a719e15e3e862d6a3dc0bc61cb68da9934fb427c6f'
@@ -41,6 +42,7 @@
         'bf06e3046cf47debaa508ed11d3f8047424cd16ed7a044dc16a0dc94949ff280c2dc63683e69700a0930b6e0e66bb376b1e366c21a6076f8b56ddc8e06ba0794'
         '21f7fc163ffcf6857f3a21a8519a42600fd6b3658d14b32191ef1142c817c10c8dc691a3bc39228927ac29d7b7ac5c3a62eb786853046bacb9cc74efb51b6cb0'
         'c1f522f6554a7bfe0f7b789b042ada14316ecc87bc196c83bec95f684152f323a4c31f60ff26843e36338b8c7949bf36719a5c8afa439ff71f7c74dae4c755b6'
+        '978f7ce1e86bcfb8800faaa3b8b40c52e13bfbf13e5b439efe602aa7787c8e230d808519ae43afbe028275cdf01d7ed3cecbeea3e276cd1bd133037ae948f21c'
         'e9d01c1a1a63c07f720e3ee53ee3ef634ab12694135300cb0ce47ade0e9e0084967a0b6df64d983e8184240eb3defb128f650bddb7727e901d50315307f3398a')
 
 prepare() {

Modified: dkms.conf.in
===================================================================
--- dkms.conf.in	2022-03-23 00:40:14 UTC (rev 1171160)
+++ dkms.conf.in	2022-03-23 00:47:47 UTC (rev 1171161)
@@ -12,4 +12,5 @@
 PATCH[7]="008-linux415.patch"
 PATCH[8]="010-linux56.patch"
 PATCH[9]="011-linux59.patch"
+PATCH[10]="012-linux517.patch"
 AUTOINSTALL="yes"