mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-18 01:47:12 +02:00
package/broadcom-wl: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20454 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
3bcef7b721
commit
adc57834c9
@ -1,8 +1,6 @@
|
|||||||
Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
|
--- a/router/shared/linux_timer.c
|
||||||
===================================================================
|
+++ b/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
|
@@ -94,6 +94,7 @@ typedef long uclock_t;
|
||||||
+++ broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c 2008-04-07 00:14:52.288470602 +0200
|
|
||||||
@@ -94,6 +94,7 @@
|
|
||||||
#define TFLAG_NONE 0
|
#define TFLAG_NONE 0
|
||||||
#define TFLAG_CANCELLED (1<<0)
|
#define TFLAG_CANCELLED (1<<0)
|
||||||
#define TFLAG_DELETED (1<<1)
|
#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 event {
|
||||||
struct timeval it_interval;
|
struct timeval it_interval;
|
||||||
@@ -207,6 +208,7 @@
|
@@ -207,6 +208,7 @@ int timer_create(
|
||||||
|
|
||||||
event_freelist = event->next;
|
event_freelist = event->next;
|
||||||
event->next = NULL;
|
event->next = NULL;
|
||||||
@ -18,7 +16,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
|
|||||||
|
|
||||||
check_event_queue();
|
check_event_queue();
|
||||||
|
|
||||||
@@ -387,6 +389,7 @@
|
@@ -387,6 +389,7 @@ int timer_settime
|
||||||
}
|
}
|
||||||
|
|
||||||
event->flags &= ~TFLAG_CANCELLED;
|
event->flags &= ~TFLAG_CANCELLED;
|
||||||
@ -26,7 +24,7 @@ Index: broadcom-wl-4.150.10.5.2/router/shared/linux_timer.c
|
|||||||
|
|
||||||
unblock_timer();
|
unblock_timer();
|
||||||
|
|
||||||
@@ -502,7 +505,15 @@
|
@@ -502,7 +505,15 @@ static void alarm_handler(int i)
|
||||||
(*(event->func))((timer_t) event, (int)event->arg);
|
(*(event->func))((timer_t) event, (int)event->arg);
|
||||||
|
|
||||||
/* If the event has been cancelled, do NOT put it back on the queue. */
|
/* 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
|
/* if the event is a recurring event, reset the timer and
|
||||||
* find its correct place in the sorted list of events.
|
* 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. */
|
/* link our new event into the pending event queue. */
|
||||||
event->next = *ppevent;
|
event->next = *ppevent;
|
||||||
*ppevent = event;
|
*ppevent = event;
|
||||||
|
Loading…
Reference in New Issue
Block a user