diff options
| -rw-r--r-- | net/irda/timer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/irda/timer.c b/net/irda/timer.c index 0c4c115a5cab..f2280f73b057 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c | |||
| @@ -60,8 +60,8 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s) | |||
| 60 | * to avoid messing with for incoming connections requests and | 60 | * to avoid messing with for incoming connections requests and |
| 61 | * to accommodate devices that perform discovery slower than us. | 61 | * to accommodate devices that perform discovery slower than us. |
| 62 | * Jean II */ | 62 | * Jean II */ |
| 63 | timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) | 63 | timeout = msecs_to_jiffies(sysctl_slot_timeout) * (S - s) |
| 64 | + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT); | 64 | + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT; |
| 65 | 65 | ||
| 66 | /* Set or re-set the timer. We reset the timer for each received | 66 | /* Set or re-set the timer. We reset the timer for each received |
| 67 | * discovery query, which allow us to automatically adjust to | 67 | * discovery query, which allow us to automatically adjust to |