diff options
Diffstat (limited to 'net/irda/irda_device.c')
-rw-r--r-- | net/irda/irda_device.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/net/irda/irda_device.c b/net/irda/irda_device.c index 7e7a31798d8d..e717801b38f9 100644 --- a/net/irda/irda_device.c +++ b/net/irda/irda_device.c | |||
@@ -341,11 +341,11 @@ static void irda_task_timer_expired(void *data) | |||
341 | */ | 341 | */ |
342 | static void irda_device_setup(struct net_device *dev) | 342 | static void irda_device_setup(struct net_device *dev) |
343 | { | 343 | { |
344 | dev->hard_header_len = 0; | 344 | dev->hard_header_len = 0; |
345 | dev->addr_len = LAP_ALEN; | 345 | dev->addr_len = LAP_ALEN; |
346 | 346 | ||
347 | dev->type = ARPHRD_IRDA; | 347 | dev->type = ARPHRD_IRDA; |
348 | dev->tx_queue_len = 8; /* Window size + 1 s-frame */ | 348 | dev->tx_queue_len = 8; /* Window size + 1 s-frame */ |
349 | 349 | ||
350 | memset(dev->broadcast, 0xff, LAP_ALEN); | 350 | memset(dev->broadcast, 0xff, LAP_ALEN); |
351 | 351 | ||
@@ -354,7 +354,7 @@ static void irda_device_setup(struct net_device *dev) | |||
354 | } | 354 | } |
355 | 355 | ||
356 | /* | 356 | /* |
357 | * Funciton alloc_irdadev | 357 | * Funciton alloc_irdadev |
358 | * Allocates and sets up an IRDA device in a manner similar to | 358 | * Allocates and sets up an IRDA device in a manner similar to |
359 | * alloc_etherdev. | 359 | * alloc_etherdev. |
360 | */ | 360 | */ |
@@ -386,9 +386,9 @@ dongle_t *irda_device_dongle_init(struct net_device *dev, int type) | |||
386 | /* Try to load the module needed */ | 386 | /* Try to load the module needed */ |
387 | if (!reg && capable(CAP_SYS_MODULE)) { | 387 | if (!reg && capable(CAP_SYS_MODULE)) { |
388 | spin_unlock(&dongles->hb_spinlock); | 388 | spin_unlock(&dongles->hb_spinlock); |
389 | 389 | ||
390 | request_module("irda-dongle-%d", type); | 390 | request_module("irda-dongle-%d", type); |
391 | 391 | ||
392 | spin_lock(&dongles->hb_spinlock); | 392 | spin_lock(&dongles->hb_spinlock); |
393 | reg = hashbin_find(dongles, type, NULL); | 393 | reg = hashbin_find(dongles, type, NULL); |
394 | } | 394 | } |
@@ -438,15 +438,15 @@ int irda_device_register_dongle(struct dongle_reg *new) | |||
438 | spin_lock(&dongles->hb_spinlock); | 438 | spin_lock(&dongles->hb_spinlock); |
439 | /* Check if this dongle has been registered before */ | 439 | /* Check if this dongle has been registered before */ |
440 | if (hashbin_find(dongles, new->type, NULL)) { | 440 | if (hashbin_find(dongles, new->type, NULL)) { |
441 | IRDA_MESSAGE("%s: Dongle type %x already registered\n", | 441 | IRDA_MESSAGE("%s: Dongle type %x already registered\n", |
442 | __FUNCTION__, new->type); | 442 | __FUNCTION__, new->type); |
443 | } else { | 443 | } else { |
444 | /* Insert IrDA dongle into hashbin */ | 444 | /* Insert IrDA dongle into hashbin */ |
445 | hashbin_insert(dongles, (irda_queue_t *) new, new->type, NULL); | 445 | hashbin_insert(dongles, (irda_queue_t *) new, new->type, NULL); |
446 | } | 446 | } |
447 | spin_unlock(&dongles->hb_spinlock); | 447 | spin_unlock(&dongles->hb_spinlock); |
448 | 448 | ||
449 | return 0; | 449 | return 0; |
450 | } | 450 | } |
451 | EXPORT_SYMBOL(irda_device_register_dongle); | 451 | EXPORT_SYMBOL(irda_device_register_dongle); |
452 | 452 | ||
@@ -462,7 +462,7 @@ void irda_device_unregister_dongle(struct dongle_reg *dongle) | |||
462 | 462 | ||
463 | spin_lock(&dongles->hb_spinlock); | 463 | spin_lock(&dongles->hb_spinlock); |
464 | node = hashbin_remove(dongles, dongle->type, NULL); | 464 | node = hashbin_remove(dongles, dongle->type, NULL); |
465 | if (!node) | 465 | if (!node) |
466 | IRDA_ERROR("%s: dongle not found!\n", __FUNCTION__); | 466 | IRDA_ERROR("%s: dongle not found!\n", __FUNCTION__); |
467 | spin_unlock(&dongles->hb_spinlock); | 467 | spin_unlock(&dongles->hb_spinlock); |
468 | } | 468 | } |