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

[Alexander Rødseth]

    Date: Wednesday, May 10, 2017 @ 18:24:49
  Author: arodseth
Revision: 227717

upgpkg: broadcom-wl-dkms 6.30.223.271-12

Added:
  broadcom-wl-dkms/trunk/006-linux411.patch
Modified:
  broadcom-wl-dkms/trunk/PKGBUILD	(contents, properties)
  broadcom-wl-dkms/trunk/dkms.conf.in

--------------------+
 006-linux411.patch |   28 ++++++++++++++++++++++++++++
 PKGBUILD           |   25 ++++++++++++++-----------
 dkms.conf.in       |    1 +
 3 files changed, 43 insertions(+), 11 deletions(-)

Added: 006-linux411.patch
===================================================================
--- 006-linux411.patch	                        (rev 0)
+++ 006-linux411.patch	2017-05-10 18:24:49 UTC (rev 227717)
@@ -0,0 +1,28 @@
+diff --git a/src/wl/sys/wl_cfg80211_hybrid.c b/src/wl/sys/wl_cfg80211_hybrid.c
+index a9671e2..e2c69f9 100644
+--- a/src/wl/sys/wl_cfg80211_hybrid.c
++++ b/src/wl/sys/wl_cfg80211_hybrid.c
+@@ -38,6 +38,9 @@
+#include <wlioctl.h>
+#include <proto/802.11.h>
+#include <wl_cfg80211_hybrid.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)
++#include <linux/sched/signal.h>
++#endif
+
+#define EVENT_TYPE(e) dtoh32((e)->event_type)
+#define EVENT_FLAGS(e) dtoh16((e)->flags)
+diff --git a/src/wl/sys/wl_linux.c b/src/wl/sys/wl_linux.c
+index 4a99b9a..89e615b 100644
+--- a/src/wl/sys/wl_linux.c
++++ b/src/wl/sys/wl_linux.c
+@@ -2916,7 +2916,9 @@ wl_monitor(wl_info_t *wl, wl_rxsts_t *rxsts, void *p)
+if (skb == NULL) return;
+
+skb->dev = wl->monitor_dev;
++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 11, 0)
+skb->dev->last_rx = jiffies;
++#endif
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 22)
+skb_reset_mac_header(skb);
+#else

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-05-10 15:56:52 UTC (rev 227716)
+++ PKGBUILD	2017-05-10 18:24:49 UTC (rev 227717)
@@ -1,11 +1,12 @@
+# $Id$
 # Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: Andrey Vihrov <andrey.vihrov at gmail.com>
-# Contributor: Frank Vanderham <twelve.eighty at gmail.com>
-# Contributor: USA-RedDragon (AUR)
+# Contributor: Andrey Vihrov <andrey.vihrov at gmail.com>
+# Contributor: Frank Vanderham <twelve.eighty at gmail.com>
+# Contributor: Jacob McSwain <jacob.a.mcswain at gmail.com>
 
 pkgname=broadcom-wl-dkms
 pkgver=6.30.223.271
-pkgrel=11
+pkgrel=12
 pkgdesc='Broadcom 802.11 Linux STA wireless driver'
 arch=('x86_64' 'i686')
 url="https://www.broadcom.com/support/download-search/?pf=Wireless+LAN+Infrastructure"
@@ -19,16 +20,18 @@
         '002-rdtscl.patch'
         '003-linux47.patch'
         '004-linux48.patch'
-        '005-debian-fix-kernel-warnings.patch')
+        '005-debian-fix-kernel-warnings.patch'
+        '006-linux411.patch')
 source_i686=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35-nodebug-pcoem-${pkgver//./_}.tar.gz")
 source_x86_64=("https://docs.broadcom.com/docs-and-downloads/docs/linux_sta/hybrid-v35_64-nodebug-pcoem-${pkgver//./_}.tar.gz")
 sha256sums=('b97bc588420d1542f73279e71975ccb5d81d75e534e7b5717e01d6e6adf6a283'
-            '2ffa76c0422801977a802c87423b3404f1de4dfe75a01bec7629acf300a074e9'
+            '06b20686c0dce5d7c5ca8930ac896ed9444be6638051d8aace117462fabd628a'
             '32e505a651fdb9fd5e4870a9d6de21dd703dead768c2b3340a2ca46671a5852f'
             '4ea03f102248beb8963ad00bd3e36e67519a90fa39244db065e74038c98360dd'
             '30ce1d5e8bf78aee487d0f3ac76756e1060777f70ed1a9cf95215c3a52cfbe2e'
             '09d709df0c764118ca43117f5c096163d9669a28170da8476d4b8211bd225d2e'
-            '2306a59f9e7413f35a0669346dcd05ef86fa37c23b566dceb0c6dbee67e4d299')
+            '2306a59f9e7413f35a0669346dcd05ef86fa37c23b566dceb0c6dbee67e4d299'
+            'c7a72e0d1e370a154288dd1d9af9d81b9cc3b7130329ce23fc86a0eea996b38f')
 sha256sums_x86_64=('5f79774d5beec8f7636b59c0fb07a03108eef1e3fd3245638b20858c714144be')
 sha256sums_i686=('4f8b70b293ac8cc5c70e571ad5d1878d0f29d133a46fe7869868d9c19b5058cd')
 
@@ -42,11 +45,11 @@
   local dest="$pkgdir/usr/src/${pkgname/-dkms/}-$pkgver"
   mkdir -p "$dest"
   cp -a src Makefile dkms.conf "$dest"
-  install -D -m 0644 -t "$dest/patches" *.patch
-  install -D -m 0644 lib/wlc_hybrid.o_shipped "${pkgdir}/usr/lib/${pkgname}/wlc_hybrid.o_shipped"
-  install -D -m 0644 broadcom-wl-dkms.conf "${pkgdir}/usr/lib/modprobe.d/broadcom-wl-dkms.conf"
+  install -Dm644 -t "$dest/patches" *.patch
+  install -Dm644 lib/wlc_hybrid.o_shipped "${pkgdir}/usr/lib/${pkgname}/wlc_hybrid.o_shipped"
+  install -Dm644 broadcom-wl-dkms.conf "${pkgdir}/usr/lib/modprobe.d/broadcom-wl-dkms.conf"
   local ldir="$pkgdir/usr/share/licenses/$pkgname"
-  install -D -m 0644 lib/LICENSE.txt "${ldir}/LICENSE.shipped"
+  install -Dm644 lib/LICENSE.txt "${ldir}/LICENSE.shipped"
   sed -n -e '/Copyright/,/SOFTWARE\./{s/^ \* //;p}' src/wl/sys/wl_linux.c > "${ldir}/LICENSE.module"
 }
 


Property changes on: broadcom-wl-dkms/trunk/PKGBUILD
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Modified: dkms.conf.in
===================================================================
--- dkms.conf.in	2017-05-10 15:56:52 UTC (rev 227716)
+++ dkms.conf.in	2017-05-10 18:24:49 UTC (rev 227717)
@@ -7,4 +7,5 @@
 PATCH[2]="003-linux47.patch"
 PATCH[3]="004-linux48.patch"
 PATCH[4]="005-debian-fix-kernel-warnings.patch"
+PATCH[5]="006-linux411.patch"
 AUTOINSTALL="yes"