packages: kernel-net-wl/kernel-net-wl.spec, kernel-net-wl/broadcom-sta_4_ke...

[gotar]

Author: gotar                        Date: Wed Feb 23 13:06:52 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use semaphore instead of mutex patch against 2.6.37+
  http://letstalktech.org/broadcom-sta_4_kernel-2.6.37.patch

---- Files affected:
packages/kernel-net-wl:
   kernel-net-wl.spec (1.14 -> 1.15) , broadcom-sta_4_kernel-2.6.37.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/kernel-net-wl/kernel-net-wl.spec
diff -u packages/kernel-net-wl/kernel-net-wl.spec:1.14 packages/kernel-net-wl/kernel-net-wl.spec:1.15
--- packages/kernel-net-wl/kernel-net-wl.spec:1.14	Wed Feb 23 04:11:50 2011
+++ packages/kernel-net-wl/kernel-net-wl.spec	Wed Feb 23 14:06:47 2011
@@ -10,16 +10,17 @@
 Summary:	Linux kernel module for BCM network cards
 Name:		%{pname}%{_alt_kernel}
 Version:	5.100.82.38
-%define ver	5_100_82_38
+%define		file_ver	%(echo %{version} | tr . _)
 Release:	%{rel}
 License:	other
 Group:		Base/Kernel
-Source0:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v%{ver}.tar.gz
+Source0:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_32-v%{file_ver}.tar.gz
 # Source0-md5:	c0074a1622c75916442e26763ddf47d0
-Source1:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v%{ver}.tar.gz
+Source1:	http://www.broadcom.com/docs/linux_sta/hybrid-portsrc_x86_64-v%{file_ver}.tar.gz
 # Source1-md5:	cac172f7422fa43264049c7065fe21d6
 Source2:	http://www.broadcom.com/docs/linux_sta/README.txt
 # Source2-md5:	24976921c7b8854ed2cd56fbc5b1c13c
+Patch0:		broadcom-sta_4_kernel-2.6.37.patch
 URL:		http://www.broadcom.com/support/802.11/linux_sta.php
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.20.2}
 BuildRequires:	rpmbuild(macros) >= 1.379
@@ -56,6 +57,7 @@
 %define		src 0
 %endif
 %setup -c -T -q -n %{pname}-%{version} -b%src
+%patch0 -p0
 
 cat > Makefile << EOF
 obj-m	+= wl.o
@@ -104,6 +106,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2011/02/23 13:06:47  gotar
+- use semaphore instead of mutex patch against 2.6.37+
+  http://letstalktech.org/broadcom-sta_4_kernel-2.6.37.patch
+
 Revision 1.14  2011/02/23 03:11:50  gotar
 - knock, knock, distfiles?
 

================================================================
Index: packages/kernel-net-wl/broadcom-sta_4_kernel-2.6.37.patch
diff -u /dev/null packages/kernel-net-wl/broadcom-sta_4_kernel-2.6.37.patch:1.1
--- /dev/null	Wed Feb 23 14:06:52 2011
+++ packages/kernel-net-wl/broadcom-sta_4_kernel-2.6.37.patch	Wed Feb 23 14:06:47 2011
@@ -0,0 +1,16 @@
+*** src/wl/sys/wl_linux.c~	2010-12-15 10:58:07.000000000 +0900
+--- src/wl/sys/wl_linux.c	2011-02-06 20:53:15.056000007 +0900
+***************
+*** 482,488 ****
+--- 482,492 ----
+  #ifdef WL_ALL_PASSIVE
+  		spin_lock_init(&wl->txq_lock);
+  #endif 
++ #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,
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel-net-wl/kernel-net-wl.spec?r1=1.14&r2=1.15&f=u