diff options
Diffstat (limited to 'net/irda/timer.c')
| -rw-r--r-- | net/irda/timer.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/irda/timer.c b/net/irda/timer.c index d3a6ee8cc4a..0c4c115a5ca 100644 --- a/net/irda/timer.c +++ b/net/irda/timer.c @@ -18,13 +18,12 @@ * published by the Free Software Foundation; either version 2 of * the License, or (at your option) any later version. * - * Neither Dag Brattli nor University of Tromsø admit liability nor + * Neither Dag Brattli nor University of Tromsø admit liability nor * provide warranty for any of this software. This material is * provided "AS-IS" and at no charge. * ********************************************************************/ -#include <asm/system.h> #include <linux/delay.h> #include <net/irda/timer.h> @@ -58,8 +57,8 @@ void irlap_start_query_timer(struct irlap_cb *self, int S, int s) * Basically, we multiply the number of remaining slots by our * slot time, plus add some extra time to properly receive the last * discovery packet (which is longer due to extra discovery info), - * to avoid messing with for incomming connections requests and - * to accomodate devices that perform discovery slower than us. + * to avoid messing with for incoming connections requests and + * to accommodate devices that perform discovery slower than us. * Jean II */ timeout = ((sysctl_slot_timeout * HZ / 1000) * (S - s) + XIDEXTRA_TIMEOUT + SMALLBUSY_TIMEOUT); @@ -219,7 +218,7 @@ static void irlap_backoff_timer_expired(void *data) * * */ -void irlap_media_busy_expired(void* data) +static void irlap_media_busy_expired(void *data) { struct irlap_cb *self = (struct irlap_cb *) data; |