[PATCH -mm] IrCOMM discovery indication simplification

Samuel Ortiz
2007-09-30T23:30:03Z

Hi Andrew,

Every IrCOMM socket is registered with the discovery subsystem, so we don't
need to loop over all of them for every discovery event. We just need to
do it for the registered IrCOMM socket.

Would you please consider this patch for -mm inclusion ?

From: Ryan Reading <ryanr23@gmail.com>
Signed-off-by: Samuel Ortiz <samuel@sortiz.org>

---
net/irda/ircomm/ircomm_tty_attach.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)

Index: net-2.6.24-quilt/net/irda/ircomm/ircomm_tty_attach.c
===================================================================
--- net-2.6.24-quilt.orig/net/irda/ircomm/ircomm_tty_attach.c 2007-10-01 01:53:56.000000000 +0300
+++ net-2.6.24-quilt/net/irda/ircomm/ircomm_tty_attach.c 2007-10-01 01:53:58.000000000 +0300
@@ -381,18 +381,9 @@
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);
}

/*