Merge with Linux 2.3.24.

1 files changed, 20 insertions, 23 deletions

diff --git a/net/irda/timer.c b/net/irda/timer.c
index fab26fd37..974863721 100644
--- a/net/irda/timer.c
+++ b/net/irda/timer.c
@@ -6,7 +6,7 @@
  * Status:        Experimental.
  * Author:        Dag Brattli <dagb@cs.uit.no>
  * Created at:    Sat Aug 16 00:59:29 1997
- * Modified at:   Mon Sep 20 11:32:37 1999
+ * Modified at:   Thu Oct  7 12:30:19 1999
  * Modified by:   Dag Brattli <dagb@cs.uit.no>
  * 
  *     Copyright (c) 1997, 1999 Dag Brattli <dagb@cs.uit.no>, 
@@ -32,13 +32,13 @@
 #include <net/irda/irlap.h>
 #include <net/irda/irlmp_event.h>
 
-static void irlap_slot_timer_expired( void* data);
-static void irlap_query_timer_expired( void* data);
-static void irlap_final_timer_expired( void* data);
-static void irlap_wd_timer_expired( void* data);
-static void irlap_backoff_timer_expired( void* data);
+static void irlap_slot_timer_expired(void* data);
+static void irlap_query_timer_expired(void* data);
+static void irlap_final_timer_expired(void* data);
+static void irlap_wd_timer_expired(void* data);
+static void irlap_backoff_timer_expired(void* data);
 
-static void irda_device_media_busy_expired( void* data); 
+static void irlap_media_busy_expired(void* data); 
 /*
  * Function irda_start_timer (timer, timeout)
  *
@@ -63,57 +63,55 @@ void irda_start_timer(struct timer_list *ptimer, int timeout, void *data,
 	add_timer(ptimer);
 }
 
-inline void irlap_start_slot_timer(struct irlap_cb *self, int timeout)
+void irlap_start_slot_timer(struct irlap_cb *self, int timeout)
 {
 	irda_start_timer(&self->slot_timer, timeout, (void *) self, 
 			 irlap_slot_timer_expired);
 }
 
-inline void irlap_start_query_timer(struct irlap_cb *self, int timeout)
+void irlap_start_query_timer(struct irlap_cb *self, int timeout)
 {
 	irda_start_timer( &self->query_timer, timeout, (void *) self, 
 			  irlap_query_timer_expired);
 }
 
-inline void irlap_start_final_timer(struct irlap_cb *self, int timeout)
+void irlap_start_final_timer(struct irlap_cb *self, int timeout)
 {
 	irda_start_timer(&self->final_timer, timeout, (void *) self, 
 			 irlap_final_timer_expired);
 }
 
-inline void irlap_start_wd_timer(struct irlap_cb *self, int timeout)
+void irlap_start_wd_timer(struct irlap_cb *self, int timeout)
 {
 	irda_start_timer(&self->wd_timer, timeout, (void *) self, 
 			 irlap_wd_timer_expired);
 }
 
-inline void irlap_start_backoff_timer(struct irlap_cb *self, int timeout)
+void irlap_start_backoff_timer(struct irlap_cb *self, int timeout)
 {
 	irda_start_timer(&self->backoff_timer, timeout, (void *) self, 
 			 irlap_backoff_timer_expired);
 }
 
-inline void irda_device_start_mbusy_timer(struct irda_device *self) 
+void irlap_start_mbusy_timer(struct irlap_cb *self)
 {
 	irda_start_timer(&self->media_busy_timer, MEDIABUSY_TIMEOUT, 
-			 (void *) self, 
-			 irda_device_media_busy_expired);
-	
+			 (void *) self, irlap_media_busy_expired);
 }
 
-inline void irlmp_start_watchdog_timer(struct lsap_cb *self, int timeout) 
+void irlmp_start_watchdog_timer(struct lsap_cb *self, int timeout) 
 {
 	irda_start_timer(&self->watchdog_timer, timeout, (void *) self,
 			 irlmp_watchdog_timer_expired);
 }
 
-inline void irlmp_start_discovery_timer(struct irlmp_cb *self, int timeout) 
+void irlmp_start_discovery_timer(struct irlmp_cb *self, int timeout) 
 {
 	irda_start_timer(&self->discovery_timer, timeout, (void *) self,
 			 irlmp_discovery_timer_expired);
 }
 
-inline void irlmp_start_idle_timer(struct lap_cb *self, int timeout) 
+void irlmp_start_idle_timer(struct lap_cb *self, int timeout) 
 {
 	irda_start_timer(&self->idle_timer, timeout, (void *) self,
 			 irlmp_idle_timer_expired);
@@ -205,12 +203,11 @@ static void irlap_backoff_timer_expired(void *data)
  *
  *    
  */
-void irda_device_media_busy_expired(void* data)
+void irlap_media_busy_expired(void* data)
 {
-	struct irda_device *self = (struct irda_device *) data;
+	struct irlap_cb *self = (struct irlap_cb *) data;
 
 	ASSERT(self != NULL, return;);
-	ASSERT(self->magic == IRDA_DEVICE_MAGIC, return;);
 
-	irda_device_set_media_busy(&self->netdev, FALSE);
+	irda_device_set_media_busy(self->netdev, FALSE);
 }