patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / net / irda / irlap_event.c

diff --git a/net/irda/irlap_event.c b/net/irda/irlap_event.c
index 3871220..a58bb70 100644 (file)
--- a/net/irda/irlap_event.c
+++ b/net/irda/irlap_event.c
@@ -627,7 +627,7 @@ static int irlap_state_query(struct irlap_cb *self, IRLAP_EVENT event,
                if (irda_device_is_receiving(self->netdev) && !self->add_wait) {
                        IRDA_DEBUG(2, "%s(), device is slow to answer, "
                                   "waiting some more!\n", __FUNCTION__);
-                       irlap_start_slot_timer(self, MSECS_TO_JIFFIES(10));
+                       irlap_start_slot_timer(self, msecs_to_jiffies(10));
                        self->add_wait = TRUE;
                        return ret;
                }
@@ -849,7 +849,7 @@ static int irlap_state_setup(struct irlap_cb *self, IRLAP_EVENT event,
  *  1.5 times the time taken to transmit a SNRM frame. So this time should
  *  between 15 msecs and 45 msecs.
  */
-                       irlap_start_backoff_timer(self, MSECS_TO_JIFFIES(20 +
+                       irlap_start_backoff_timer(self, msecs_to_jiffies(20 +
                                                        (jiffies % 30)));
                } else {
                        /* Always switch state before calling upper layers */
@@ -1506,7 +1506,7 @@ static int irlap_state_nrm_p(struct irlap_cb *self, IRLAP_EVENT event,
                if (irda_device_is_receiving(self->netdev) && !self->add_wait) {
                        IRDA_DEBUG(1, "FINAL_TIMER_EXPIRED when receiving a "
                              "frame! Waiting a little bit more!\n");
-                       irlap_start_final_timer(self, MSECS_TO_JIFFIES(300));
+                       irlap_start_final_timer(self, msecs_to_jiffies(300));
 
                        /*
                         *  Don't allow this to happen one more time in a row,