ir240_irnet_disc_ind_again.diff :
-------------------------------
o [CORRECT] Correct fix for IrNET disconnect indication :
if socket is not connected, don't hangup, to allow passive operation
diff -u -p linux/net/irda/irnet/irnet.d5.h linux/net/irda/irnet/irnet.h
--- linux/net/irda/irnet/irnet.d5.h Wed Mar 20 13:26:06 2002
+++ linux/net/irda/irnet/irnet.h Wed Mar 20 13:30:25 2002
@@ -211,6 +211,12 @@
* o When receiving a disconnect indication, don't reenable the
* PPP Tx queue, this will trigger a reconnect. Instead, close
* the channel, which will kill pppd...
+ *
+ * v11 - 20.3.02 - Jean II
+ * o Oops ! v10 fix disabled IrNET retries and passive behaviour.
+ * Better fix in irnet_disconnect_indication() :
+ * - if connected, kill pppd via hangup.
+ * - if not connected, reenable ppp Tx, which trigger IrNET retry.
*/
/***************************** INCLUDES *****************************/
diff -u -p linux/net/irda/irnet/irnet_irda.d5.c linux/net/irda/irnet/irnet_irda.c
--- linux/net/irda/irnet/irnet_irda.d5.c Wed Mar 20 13:11:42 2002
+++ linux/net/irda/irnet/irnet_irda.c Wed Mar 20 13:34:09 2002
@@ -1070,7 +1070,7 @@ irnet_data_indication(void * instance,
* o attempted to connect, timeout
* o connected, link is broken, LAP has timeout
* o connected, other side close the link
- * o connection request on the server no handled
+ * o connection request on the server not handled
*/
static void
irnet_disconnect_indication(void * instance,
@@ -1121,20 +1121,31 @@ irnet_disconnect_indication(void * insta
DEBUG(IRDA_CB_INFO, "Closing our TTP connection.\n");
irttp_close_tsap(self->tsap);
self->tsap = NULL;
-
- /* Cleanup & close the PPP channel, which will kill pppd and the rest */
- if(self->ppp_open)
- ppp_unregister_channel(&self->chan);
- self->ppp_open = 0;
}
- /* Cleanup the socket in case we want to reconnect */
+ /* Cleanup the socket in case we want to reconnect in ppp_output_wakeup() */
self->stsap_sel = 0;
self->daddr = DEV_ADDR_ANY;
self->tx_flow = FLOW_START;
- /* Note : what should we say to ppp ?
- * It seem the ppp_generic and pppd are happy that way and will eventually
- * timeout gracefully, so don't bother them... */
+ /* Deal with the ppp instance if it's still alive */
+ if(self->ppp_open)
+ {
+ if(test_open)
+ {
+ /* If we were connected, cleanup & close the PPP channel,
+ * which will kill pppd (hangup) and the rest */
+ ppp_unregister_channel(&self->chan);
+ self->ppp_open = 0;
+ }
+ else
+ {
+ /* If we were trying to connect, flush (drain) ppp_generic
+ * Tx queue (most often we have blocked it), which will
+ * trigger an other attempt to connect. If we are passive,
+ * this will empty the Tx queue after last try. */
+ ppp_output_wakeup(&self->chan);
+ }
+ }
DEXIT(IRDA_TCB_TRACE, "\n");
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
This archive was generated by hypermail 2b29 : Wed Aug 07 2002 - 22:00:33 EST