git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
irda
/
timer.c
diff --git
a/net/irda/timer.c
b/net/irda/timer.c
index
0b28118
..
3871a2b
100644
(file)
--- a/
net/irda/timer.c
+++ b/
net/irda/timer.c
@@
-25,7
+25,6
@@
********************************************************************/
#include <asm/system.h>
********************************************************************/
#include <asm/system.h>
-#include <linux/config.h>
#include <linux/delay.h>
#include <net/irda/timer.h>
#include <linux/delay.h>
#include <net/irda/timer.h>
@@
-144,8
+143,8
@@
static void irlap_slot_timer_expired(void *data)
{
struct irlap_cb *self = (struct irlap_cb *) data;
{
struct irlap_cb *self = (struct irlap_cb *) data;
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == LAP_MAGIC, return;);
+
IRDA_
ASSERT(self != NULL, return;);
+
IRDA_
ASSERT(self->magic == LAP_MAGIC, return;);
irlap_do_event(self, SLOT_TIMER_EXPIRED, NULL, NULL);
}
irlap_do_event(self, SLOT_TIMER_EXPIRED, NULL, NULL);
}
@@
-160,8
+159,8
@@
static void irlap_query_timer_expired(void *data)
{
struct irlap_cb *self = (struct irlap_cb *) data;
{
struct irlap_cb *self = (struct irlap_cb *) data;
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == LAP_MAGIC, return;);
+
IRDA_
ASSERT(self != NULL, return;);
+
IRDA_
ASSERT(self->magic == LAP_MAGIC, return;);
irlap_do_event(self, QUERY_TIMER_EXPIRED, NULL, NULL);
}
irlap_do_event(self, QUERY_TIMER_EXPIRED, NULL, NULL);
}
@@
-176,8
+175,8
@@
static void irlap_final_timer_expired(void *data)
{
struct irlap_cb *self = (struct irlap_cb *) data;
{
struct irlap_cb *self = (struct irlap_cb *) data;
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == LAP_MAGIC, return;);
+
IRDA_
ASSERT(self != NULL, return;);
+
IRDA_
ASSERT(self->magic == LAP_MAGIC, return;);
irlap_do_event(self, FINAL_TIMER_EXPIRED, NULL, NULL);
}
irlap_do_event(self, FINAL_TIMER_EXPIRED, NULL, NULL);
}
@@
-192,8
+191,8
@@
static void irlap_wd_timer_expired(void *data)
{
struct irlap_cb *self = (struct irlap_cb *) data;
{
struct irlap_cb *self = (struct irlap_cb *) data;
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == LAP_MAGIC, return;);
+
IRDA_
ASSERT(self != NULL, return;);
+
IRDA_
ASSERT(self->magic == LAP_MAGIC, return;);
irlap_do_event(self, WD_TIMER_EXPIRED, NULL, NULL);
}
irlap_do_event(self, WD_TIMER_EXPIRED, NULL, NULL);
}
@@
-208,8
+207,8
@@
static void irlap_backoff_timer_expired(void *data)
{
struct irlap_cb *self = (struct irlap_cb *) data;
{
struct irlap_cb *self = (struct irlap_cb *) data;
- ASSERT(self != NULL, return;);
- ASSERT(self->magic == LAP_MAGIC, return;);
+
IRDA_
ASSERT(self != NULL, return;);
+
IRDA_
ASSERT(self->magic == LAP_MAGIC, return;);
irlap_do_event(self, BACKOFF_TIMER_EXPIRED, NULL, NULL);
}
irlap_do_event(self, BACKOFF_TIMER_EXPIRED, NULL, NULL);
}
@@
-224,7
+223,7
@@
void irlap_media_busy_expired(void* data)
{
struct irlap_cb *self = (struct irlap_cb *) data;
{
struct irlap_cb *self = (struct irlap_cb *) data;
- ASSERT(self != NULL, return;);
+
IRDA_
ASSERT(self != NULL, return;);
irda_device_set_media_busy(self->netdev, FALSE);
/* Note : the LAP event will be send in irlap_stop_mbusy_timer(),
irda_device_set_media_busy(self->netdev, FALSE);
/* Note : the LAP event will be send in irlap_stop_mbusy_timer(),