broadcom-wl-lts: fix kernel

This commit is contained in:
Phil 2011-05-10 21:36:17 +00:00
parent 729db3c575
commit cbbf2ac58c
2 changed files with 13 additions and 10 deletions

View File

@ -4,12 +4,12 @@
# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org> # maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org> # maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
# use ../fakeuname -r 2.6.35-CHAKRA-LTS ../makepkg # use ../makepkg
_kernver=`uname -r` _kernver="2.6.35-CHAKRA-LTS"
pkgname=broadcom-wl-lts pkgname=broadcom-wl-lts
pkgver=5.100.82.38 pkgver=5.100.82.38
pkgrel=1 pkgrel=3
pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver' pkgdesc='Broadcom 802.11abgn hybrid Linux networking device driver'
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
url='http://www.broadcom.com/support/802.11/linux_sta.php' 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' sha1sums=('3062830f86c5f1f41d8a4b26d6e0072dc989c7ba'
'ea7b67982ddc0f56fd3becb9914fd4458fe7d373' 'ea7b67982ddc0f56fd3becb9914fd4458fe7d373'
'105f8e1d48ebe1f25d53859e5ab9326a27435c66' '105f8e1d48ebe1f25d53859e5ab9326a27435c66'
'adf0138194ae204ad70ce44e98b2dc18ead4ae2a') '97f2bcbbe3b9ac5d88e571fc536f5d59dbc789e1')
[ "$CARCH" = 'x86_64' ] && sha1sums[0]='6076de3bd8206b3e7b8bfc2eadbe3a97eec4e735' [ "$CARCH" = 'x86_64' ] && sha1sums[0]='6076de3bd8206b3e7b8bfc2eadbe3a97eec4e735'
install=install install=install
@ -44,5 +44,5 @@ package() {
cd "$srcdir" cd "$srcdir"
install -D -m 755 wl.ko "$pkgdir/lib/modules/$_kernver/kernel/drivers/net/wireless/wl.ko" 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" 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
} }

View File

@ -1,12 +1,15 @@
diff -aur old/src/wl/sys/wl_linux.c new/src/wl/sys/wl_linux.c --- wl/src/wl/sys/wl_linux.c 2010-12-15 03:01:09.000000000 +0100
--- old/src/wl/sys/wl_linux.c 2010-12-25 18:17:33.333343048 +0100 +++ temp/src/wl/sys/wl_linux.c 2011-03-04 11:02:12.754753700 +0100
+++ new/src/wl/sys/wl_linux.c 2010-12-25 18:21:05.856676376 +0100 @@ -482,7 +482,11 @@
@@ -483,7 +483,7 @@
#ifdef WL_ALL_PASSIVE #ifdef WL_ALL_PASSIVE
spin_lock_init(&wl->txq_lock); spin_lock_init(&wl->txq_lock);
#endif #endif
- init_MUTEX(&wl->sem); - 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, if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,