From 833b40d9a2fdf6ac5eebf265bb08f85bb4e94ca7 Mon Sep 17 00:00:00 2001 From: Ryan Reading Date: Wed, 17 Oct 2007 19:34:11 -0700 Subject: [PATCH] --- yaml --- r: 71257 b: refs/heads/master c: c310f099be953a20b5fabed341ad085f444cf2bd h: refs/heads/master i: 71255: 75d9916e4ab4eb0523d54ef7d63c8ffa4c4ea74d v: v3 --- [refs] | 2 +- trunk/net/irda/ircomm/ircomm_tty_attach.c | 15 +++------------ 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 4c3705e14e38..00edba4e6c33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd5435e76a226b7151ae5aaee2cd366ab003dd2e +refs/heads/master: c310f099be953a20b5fabed341ad085f444cf2bd diff --git a/trunk/net/irda/ircomm/ircomm_tty_attach.c b/trunk/net/irda/ircomm/ircomm_tty_attach.c index 824309dabfe9..b5a13882c927 100644 --- a/trunk/net/irda/ircomm/ircomm_tty_attach.c +++ b/trunk/net/irda/ircomm/ircomm_tty_attach.c @@ -381,18 +381,9 @@ static void ircomm_tty_discovery_indication(discinfo_t *discovery, info.daddr = discovery->daddr; info.saddr = discovery->saddr; - /* FIXME. We have a locking problem on the hashbin here. - * We probably need to use hashbin_find_next(), but we first - * need to ensure that "line" is unique. - Jean II */ - self = (struct ircomm_tty_cb *) hashbin_get_first(ircomm_tty); - while (self != NULL) { - IRDA_ASSERT(self->magic == IRCOMM_TTY_MAGIC, return;); - - ircomm_tty_do_event(self, IRCOMM_TTY_DISCOVERY_INDICATION, - NULL, &info); - - self = (struct ircomm_tty_cb *) hashbin_get_next(ircomm_tty); - } + self = (struct ircomm_tty_cb *) priv; + ircomm_tty_do_event(self, IRCOMM_TTY_DISCOVERY_INDICATION, + NULL, &info); } /*