From cbbf2ac58cdeaff65d208b1869f377fe2e092e9d Mon Sep 17 00:00:00 2001
From: Phil <philm[at]chakra-project[dot]org>
Date: Tue, 10 May 2011 21:36:17 +0000
Subject: [PATCH] broadcom-wl-lts: fix kernel

---
 broadcom-wl-lts/PKGBUILD         | 10 +++++-----
 broadcom-wl-lts/mutex-sema.patch | 13 ++++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/broadcom-wl-lts/PKGBUILD b/broadcom-wl-lts/PKGBUILD
index a9c04c35c..c7afaa7fa 100644
--- a/broadcom-wl-lts/PKGBUILD
+++ b/broadcom-wl-lts/PKGBUILD
@@ -4,12 +4,12 @@
 # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
 # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
 
-# use ../fakeuname -r 2.6.35-CHAKRA-LTS ../makepkg
-_kernver=`uname -r`
+# use ../makepkg
+_kernver="2.6.35-CHAKRA-LTS"
 
 pkgname=broadcom-wl-lts
 pkgver=5.100.82.38
-pkgrel=1
+pkgrel=3
 pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
 arch=('i686' 'x86_64')
 url='http://www.broadcom.com/support/802.11/linux_sta.php'
@@ -27,7 +27,7 @@ source=("http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_${ARCH}-v${pkgver
 sha1sums=('3062830f86c5f1f41d8a4b26d6e0072dc989c7ba'
           'ea7b67982ddc0f56fd3becb9914fd4458fe7d373'
           '105f8e1d48ebe1f25d53859e5ab9326a27435c66'
-          'adf0138194ae204ad70ce44e98b2dc18ead4ae2a')
+          '97f2bcbbe3b9ac5d88e571fc536f5d59dbc789e1')
 [ "$CARCH" = 'x86_64' ] && sha1sums[0]='6076de3bd8206b3e7b8bfc2eadbe3a97eec4e735'
 
 install=install
@@ -44,5 +44,5 @@ package() {
 	cd "$srcdir"
 	install -D -m 755 wl.ko "$pkgdir/lib/modules/$_kernver/kernel/drivers/net/wireless/wl.ko"
 	install -D -m 644 lib/LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-	sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*.install
+	sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='${_kernver}'/" $startdir/*install
 }
diff --git a/broadcom-wl-lts/mutex-sema.patch b/broadcom-wl-lts/mutex-sema.patch
index 922c8f2d2..0c311c7c3 100644
--- a/broadcom-wl-lts/mutex-sema.patch
+++ b/broadcom-wl-lts/mutex-sema.patch
@@ -1,12 +1,15 @@
-diff -aur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c
---- old/src/wl/sys/wl_linux.c	2010-12-25 18:17:33.333343048 +0100
-+++ new/src/wl/sys/wl_linux.c	2010-12-25 18:21:05.856676376 +0100
-@@ -483,7 +483,7 @@
+--- wl/src/wl/sys/wl_linux.c	2010-12-15 03:01:09.000000000 +0100
++++ temp/src/wl/sys/wl_linux.c	2011-03-04 11:02:12.754753700 +0100
+@@ -482,7 +482,11 @@
  #ifdef WL_ALL_PASSIVE
  		spin_lock_init(&wl->txq_lock);
  #endif 
 -		init_MUTEX(&wl->sem);
-+		sema_init(&wl->sem, 1);
++		#ifndef init_MUTEX
++			sema_init(&wl->sem,1);
++		#else
++			init_MUTEX(&wl->sem);
++		#endif
  	}
  
  	if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,