From fc2364a9284ce89634bc4fcc214d6a8e11c79e15 Mon Sep 17 00:00:00 2001 From: Tomasz Pala Date: Wed, 23 Feb 2011 13:06:47 +0000 Subject: [PATCH] - use semaphore instead of mutex patch against 2.6.37+ http://letstalktech.org/broadcom-sta_4_kernel-2.6.37.patch Changed files: broadcom-sta_4_kernel-2.6.37.patch -> 1.1 kernel-net-wl.spec -> 1.15 --- broadcom-sta_4_kernel-2.6.37.patch | 16 ++++++++++++++++ kernel-net-wl.spec | 8 +++++--- 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 broadcom-sta_4_kernel-2.6.37.patch diff --git a/broadcom-sta_4_kernel-2.6.37.patch b/broadcom-sta_4_kernel-2.6.37.patch new file mode 100644 index 0000000..bf2efc3 --- /dev/null +++ b/broadcom-sta_4_kernel-2.6.37.patch @@ -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, diff --git a/kernel-net-wl.spec b/kernel-net-wl.spec index 3437f2e..a3c41e9 100644 --- a/kernel-net-wl.spec +++ b/kernel-net-wl.spec @@ -9,16 +9,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 @@ -55,6 +56,7 @@ This package contains Linux module. %define src 0 %endif %setup -c -T -q -n %{pname}-%{version} -b%src +%patch0 -p0 cat > Makefile << EOF obj-m += wl.o -- 2.43.0