X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbroadcom-wl%2Fpatches%2F100-timer_fix.patch;h=d1ce9c98219c49b29a654683215775e725735d27;hb=adc57834c913c964e2a5dab452a6910700d73013;hp=c3d9f63bbe161bbb6885cd1198121b29f54510ec;hpb=3bcef7b721387f2b574e3eb457510d021e3317c7;p=openwrt-10.03%2F.git

diff --git a/package/broadcom-wl/patches/100-timer_fix.patch b/package/broadcom-wl/patches/100-timer_fix.patch
index c3d9f63bb..d1ce9c982 100644
--- a/package/broadcom-wl/patches/100-timer_fix.patch
+++ b/package/broadcom-wl/patches/100-timer_fix.patch
@@ -1,8 +1,6 @@
-Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
-===================================================================
---- broadcom-wl-4.150.10.5.2.orig/router/shared/linux_timer.c	2008-04-07 00:15:24.914329846 +0200
-+++ broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c	2008-04-07 00:14:52.288470602 +0200
-@@ -94,6 +94,7 @@
+--- a/router/shared/linux_timer.c
++++ b/router/shared/linux_timer.c
+@@ -94,6 +94,7 @@ typedef long uclock_t;
  #define TFLAG_NONE	0
  #define TFLAG_CANCELLED	(1<<0)
  #define TFLAG_DELETED	(1<<1)
@@ -10,7 +8,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
  
  struct event {
      struct timeval it_interval;
-@@ -207,6 +208,7 @@
+@@ -207,6 +208,7 @@ int timer_create(
  
  	event_freelist = event->next;
  	event->next = NULL;
@@ -18,7 +16,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
  
  	check_event_queue();
  
-@@ -387,6 +389,7 @@
+@@ -387,6 +389,7 @@ int timer_settime
  	}
  
  	event->flags &= ~TFLAG_CANCELLED;
@@ -26,7 +24,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
  
  	unblock_timer();
  
-@@ -502,7 +505,15 @@
+@@ -502,7 +505,15 @@ static void alarm_handler(int i)
  		(*(event->func))((timer_t) event, (int)event->arg);
  
  		/* If the event has been cancelled, do NOT put it back on the queue. */
@@ -43,7 +41,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
  
  			/* if the event is a recurring event, reset the timer and
  			 * find its correct place in the sorted list of events.
-@@ -545,6 +556,7 @@
+@@ -545,6 +556,7 @@ static void alarm_handler(int i)
  				/* link our new event into the pending event queue. */
  				event->next = *ppevent;
  				*ppevent = event;