core/broadcom-wl/mutex-sema.patch

16 lines
421 B
Diff
Raw Normal View History

broadcom-wl: update phil@[chroot]:~/core-testing/broadcom-wl-lts$ ../fakeuname -r 2.6.35-CHAKRA-LTS ../makepkg ==> Running makepkg ver: 3.4.0-chakra-0.4 ==> Making package: broadcom-wl-lts 5.100.82.38-2 (Wed Mar 30 20:39:01 UTC 2011) ==> Checking Runtime Dependencies... ==> Checking Buildtime Dependencies... ==> Retrieving Sources... -> Found hybrid-portsrc_x86_32-v5_100_82_38.tar.gz -> Found license.patch -> Found semaphore.patch -> Found mutex-sema.patch ==> Validating source files with sha1sums... hybrid-portsrc_x86_32-v5_100_82_38.tar.gz ... Passed license.patch ... Passed semaphore.patch ... Passed mutex-sema.patch ... Passed ==> Extracting Sources... -> Extracting hybrid-portsrc_x86_32-v5_100_82_38.tar.gz with bsdtar ==> Removing existing pkg/ directory... ==> Starting build()... patching file src/wl/sys/wl_linux.c patching file src/wl/sys/wl_iw.h patching file src/wl/sys/wl_linux.c Hunk #1 succeeded at 483 (offset 1 line). make: Entering directory /usr/src/linux-2.6.35-CHAKRA-LTS' ==> Entering fakeroot environment... ==> Debug: sourcing ../_buildscripts/user.conf ==> Starting package()... ==> Tidying install... -> Removing doc files... -> Purging other files... -> Compressing man and info pages... -> Stripping unneeded symbols from binaries and libraries... ==> Creating package... -> Generating .PKGINFO file... -> Adding install script... -> Compressing package... ==> Signing package... -> Created signature file /home/phil/core-testing/_repo/local/broadcom-wl-lts-5.100.82.38-2-i686.pkg.tar.xz.sig. ==> Leaving fakeroot environment. ==> Finished making: broadcom-wl-lts 5.100.82.38-2 (Wed Mar 30 20:39:11 UTC 2011)
2011-03-31 04:40:21 +08:00
--- 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 @@
2011-01-06 05:38:27 +08:00
#ifdef WL_ALL_PASSIVE
spin_lock_init(&wl->txq_lock);
#endif
- init_MUTEX(&wl->sem);
broadcom-wl: update phil@[chroot]:~/core-testing/broadcom-wl-lts$ ../fakeuname -r 2.6.35-CHAKRA-LTS ../makepkg ==> Running makepkg ver: 3.4.0-chakra-0.4 ==> Making package: broadcom-wl-lts 5.100.82.38-2 (Wed Mar 30 20:39:01 UTC 2011) ==> Checking Runtime Dependencies... ==> Checking Buildtime Dependencies... ==> Retrieving Sources... -> Found hybrid-portsrc_x86_32-v5_100_82_38.tar.gz -> Found license.patch -> Found semaphore.patch -> Found mutex-sema.patch ==> Validating source files with sha1sums... hybrid-portsrc_x86_32-v5_100_82_38.tar.gz ... Passed license.patch ... Passed semaphore.patch ... Passed mutex-sema.patch ... Passed ==> Extracting Sources... -> Extracting hybrid-portsrc_x86_32-v5_100_82_38.tar.gz with bsdtar ==> Removing existing pkg/ directory... ==> Starting build()... patching file src/wl/sys/wl_linux.c patching file src/wl/sys/wl_iw.h patching file src/wl/sys/wl_linux.c Hunk #1 succeeded at 483 (offset 1 line). make: Entering directory /usr/src/linux-2.6.35-CHAKRA-LTS' ==> Entering fakeroot environment... ==> Debug: sourcing ../_buildscripts/user.conf ==> Starting package()... ==> Tidying install... -> Removing doc files... -> Purging other files... -> Compressing man and info pages... -> Stripping unneeded symbols from binaries and libraries... ==> Creating package... -> Generating .PKGINFO file... -> Adding install script... -> Compressing package... ==> Signing package... -> Created signature file /home/phil/core-testing/_repo/local/broadcom-wl-lts-5.100.82.38-2-i686.pkg.tar.xz.sig. ==> Leaving fakeroot environment. ==> Finished making: broadcom-wl-lts 5.100.82.38-2 (Wed Mar 30 20:39:11 UTC 2011)
2011-03-31 04:40:21 +08:00
+ #ifndef init_MUTEX
+ sema_init(&wl->sem,1);
+ #else
+ init_MUTEX(&wl->sem);
+ #endif
2011-01-06 05:38:27 +08:00
}
if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,