MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Get broadcom-sta to work on kernels >= 2.6.37

Browse source 
Patch from http://forums.linuxmint.com/viewtopic.php?f=141&t=57056&start=20#p378103

svn path=/nixpkgs/trunk/; revision=26806
This commit is contained in:
Shea Levy 2011-04-12 15:54:39 +00:00
parent ce249b627b
commit 564edafa1a
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/os-specific/linux/broadcom-sta/default.nix
View file

@ -15,7 +15,10 @@ stdenv.mkDerivation {
}; };
buildInputs = [ kernel ]; buildInputs = [ kernel ];
patches = [ ./makefile.patch ]; patches = [ ./makefile.patch ]
++ stdenv.lib.optional
(! builtins.lessThan (builtins.compareVersions kernel.version "2.6.37") 0)
[ ./mutex-sema.patch ];
makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build"; makeFlags = "KDIR=${kernel}/lib/modules/${kernel.version}/build";

12
pkgs/os-specific/linux/broadcom-sta/mutex-sema.patch Normal file
View file

@ -0,0 +1,12 @@
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 @@
#ifdef WL_ALL_PASSIVE
spin_lock_init(&wl->txq_lock);
#endif
- init_MUTEX(&wl->sem);
+ sema_init(&wl->sem, 1);
}
if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,