diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-10-09 00:00:47 +0000 |
| commit | d6434e1042f3b0a6dfe1b1f615af369486f9b1fa (patch) | |
| tree | e2be02f33984c48ec019c654051d27964e42c441 /net/irda/discovery.c | |
| parent | 609d1e803baf519487233b765eb487f9ec227a18 (diff) | |
Merge with 2.3.19.
Diffstat (limited to 'net/irda/discovery.c')
| -rw-r--r-- | net/irda/discovery.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/net/irda/discovery.c b/net/irda/discovery.c index 380f1f6a8..2419a62f2 100644 --- a/net/irda/discovery.c +++ b/net/irda/discovery.c @@ -6,7 +6,7 @@ * Status: Experimental. * Author: Dag Brattli <dagb@cs.uit.no> * Created at: Tue Apr 6 15:33:50 1999 - * Modified at: Fri May 28 20:46:38 1999 + * Modified at: Mon Aug 23 09:48:40 1999 * Modified by: Dag Brattli <dagb@cs.uit.no> * Modified at: Fri May 28 3:11 CST 1999 * Modified by: Horst von Brand <vonbrand@sleipnir.valparaiso.cl> @@ -66,7 +66,7 @@ void irlmp_add_discovery(hashbin_t *cachelog, discovery_t *new) discovery = (discovery_t *) hashbin_get_next(cachelog); if ((node->daddr == new->daddr) || - (strcmp(node->info, new->info) == 0)) + (strcmp(node->nickname, new->nickname) == 0)) { /* This discovery is a previous discovery * from the same device, so just remove it @@ -122,7 +122,7 @@ void irlmp_add_discovery_log(hashbin_t *cachelog, hashbin_t *log) * Go through all discoveries and expire all that has stayed to long * */ -void irlmp_expire_discoveries(hashbin_t *log, int saddr, int force) +void irlmp_expire_discoveries(hashbin_t *log, __u32 saddr, int force) { discovery_t *discovery, *curr; @@ -163,7 +163,7 @@ void irlmp_dump_discoveries(hashbin_t *log) DEBUG(0, "Discovery:\n"); DEBUG(0, " daddr=%08x\n", discovery->daddr); DEBUG(0, " saddr=%08x\n", discovery->saddr); - DEBUG(0, " name=%s\n", discovery->info); + DEBUG(0, " nickname=%s\n", discovery->nickname); discovery = (discovery_t *) hashbin_get_next(log); } @@ -178,8 +178,8 @@ void irlmp_dump_discoveries(hashbin_t *log) */ __u32 irlmp_find_device(hashbin_t *cachelog, char *name, __u32 *saddr) { - discovery_t *d; unsigned long flags; + discovery_t *d; spin_lock_irqsave(&irlmp->lock, flags); @@ -188,9 +188,9 @@ __u32 irlmp_find_device(hashbin_t *cachelog, char *name, __u32 *saddr) while (d != NULL) { DEBUG(1, "Discovery:\n"); DEBUG(1, " daddr=%08x\n", d->daddr); - DEBUG(1, " name=%s\n", d->info); + DEBUG(1, " nickname=%s\n", d->nickname); - if (strcmp(name, d->info) == 0) { + if (strcmp(name, d->nickname) == 0) { *saddr = d->saddr; spin_unlock_irqrestore(&irlmp->lock, flags); @@ -227,7 +227,7 @@ int discovery_proc_read(char *buf, char **start, off_t offset, int len, discovery = (discovery_t *) hashbin_get_first(cachelog); while ( discovery != NULL) { - len += sprintf(buf+len, "name: %s,", discovery->info); + len += sprintf(buf+len, "nickname: %s,", discovery->nickname); len += sprintf(buf+len, " hint: 0x%02x%02x", discovery->hints.byte[0], |