patch-2.4.20 linux-2.4.20/net/irda/irlan/irlan_client.c

• Lines: 27
• Date: Thu Nov 28 15:53:16 2002
• Orig file: linux-2.4.19/net/irda/irlan/irlan_client.c
• Orig date: Thu Feb 8 13:08:38 2001

diff -urN linux-2.4.19/net/irda/irlan/irlan_client.c linux-2.4.20/net/irda/irlan/irlan_client.c
@@ -145,7 +145,9 @@
  *    Remote device with IrLAN server support discovered
  *
  */
-void irlan_client_discovery_indication(discovery_t *discovery, void *priv) 
+void irlan_client_discovery_indication(discovery_t *discovery,
+				       DISCOVERY_MODE mode,
+				       void *priv) 
 {
 	struct irlan_cb *self;
 	__u32 saddr, daddr;
@@ -155,6 +157,15 @@
 	ASSERT(irlan != NULL, return;);
 	ASSERT(discovery != NULL, return;);
 
+	/*
+	 * I didn't check it, but I bet that IrLAN suffer from the same
+	 * deficiency as IrComm and doesn't handle two instances
+	 * simultaneously connecting to each other.
+	 * Same workaround, drop passive discoveries.
+	 * Jean II */
+	if(mode == DISCOVERY_PASSIVE)
+		return;
+
 	saddr = discovery->saddr;
 	daddr = discovery->daddr;