Changeset 7490

Timestamp:

03/09/11 03:52:31 (2 years ago)

Author:

alanbach-guest

Message:

• Fixed broken patches

Location:

pkg/raul/non-free/broadcom-sta/trunk/debian/patches

Files:

• 02_gcc_fix.patch (modified) (2 diffs)
• 03_2.6.37_fix.patch (modified) (1 diff)
• series (modified) (1 diff)

pkg/raul/non-free/broadcom-sta/trunk/debian/patches/02_gcc_fix.patch

@@ -1 @@
-diff -Naur broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h
---- broadcom-sta-5.60.246.2.orig//src/wl/sys/wl_iw.h    2010-10-08 07:32:59.000000000 +0900
-+++ broadcom-sta-5.60.246.2/src/wl/sys/wl_iw.h  2010-10-28 00:50:57.925351964 +0900
+diff -urN broadcom-sta//amd64/src/wl/sys/wl_iw.h broadcom-sta.new//amd64/src/wl/sys/wl_iw.h
+--- broadcom-sta//amd64/src/wl/sys/wl_iw.h      2010-12-14 18:01:09.000000000 -0800
++++ broadcom-sta.new//amd64/src/wl/sys/wl_iw.h  2011-03-08 18:51:35.280829000 -0800
 @@ -15,6 +15,7 @@
  #ifndef _wl_iw_h_
@@ -10 +10 @@
  
  #include <typedefs.h>
-
+diff -urN broadcom-sta//i386/src/wl/sys/wl_iw.h broadcom-sta.new//i386/src/wl/sys/wl_iw.h
+--- broadcom-sta//i386/src/wl/sys/wl_iw.h       2010-12-14 17:58:07.000000000 -0800
++++ broadcom-sta.new//i386/src/wl/sys/wl_iw.h   2011-03-08 18:51:28.429829002 -0800
+@@ -15,6 +15,7 @@
+ #ifndef _wl_iw_h_
+ #define _wl_iw_h_
+ 
++#include <linux/semaphore.h>
+ #include <linux/wireless.h>
+ 
+ #include <typedefs.h>

pkg/raul/non-free/broadcom-sta/trunk/debian/patches/03_2.6.37_fix.patch

@@ -1 @@
-diff -Naur broadcom-sta.orig/src/wl/sys/wl_linux.c broadcom-sta/src/wl/sys/wl_linux.c
---- broadcom-sta.orig/src/wl/sys/wl_linux.c 2010-12-15 11:01:09.000000000 +0900
-+++ broadcom-sta/src/wl/sys/wl_linux.c  2011-01-02 00:18:32.438095116 +0900
+diff -urN broadcom-sta//amd64/src/wl/sys/wl_linux.c broadcom-sta.new//amd64/src/wl/sys/wl_linux.c
+--- broadcom-sta//amd64/src/wl/sys/wl_linux.c   2010-12-14 18:01:09.000000000 -0800
++++ broadcom-sta.new//amd64/src/wl/sys/wl_linux.c       2011-03-08 18:49:42.635828999 -0800
 @@ -482,7 +482,11 @@
  #ifdef WL_ALL_PASSIVE
-        spin_lock_init(&wl->txq_lock);
+                spin_lock_init(&wl->txq_lock);
  #endif 
+-               init_MUTEX(&wl->sem);
 +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
-+       sema_init(&wl->sem, 1);
++                sema_init(&wl->sem, 1);
 +#else
-        init_MUTEX(&wl->sem);
++                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,
+diff -urN broadcom-sta//i386/src/wl/sys/wl_linux.c broadcom-sta.new//i386/src/wl/sys/wl_linux.c
+--- broadcom-sta//i386/src/wl/sys/wl_linux.c    2010-12-14 17:58:07.000000000 -0800
++++ broadcom-sta.new//i386/src/wl/sys/wl_linux.c        2011-03-08 18:49:15.717828999 -0800
+@@ -482,7 +482,11 @@
+ #ifdef WL_ALL_PASSIVE
+                spin_lock_init(&wl->txq_lock);
+ #endif 
+-               init_MUTEX(&wl->sem);
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)
++                sema_init(&wl->sem, 1);
++#else
++                init_MUTEX(&wl->sem);
++#endif
+        }
+ 
+        if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode,

pkg/raul/non-free/broadcom-sta/trunk/debian/patches/series

@@ -1 +1 @@
 01-license.patch
+02_gcc_fix.patch
 03_2.6.37_fix.patch