patch-2.4.19 linux-2.4.19/net/irda/irnet/irnet_irda.c

Next file: linux-2.4.19/net/khttpd/main.c
Previous file: linux-2.4.19/net/irda/irnet/irnet.h
Back to the patch index
Back to the overall index

diff -urN linux-2.4.18/net/irda/irnet/irnet_irda.c linux-2.4.19/net/irda/irnet/irnet_irda.c
@@ -1122,9 +1122,10 @@
       irttp_close_tsap(self->tsap);
       self->tsap = NULL;
 
-      /* Flush (drain) ppp_generic Tx queue (most often we have blocked it) */
+      /* Cleanup & close the PPP channel, which will kill pppd and the rest */
       if(self->ppp_open)
-	ppp_output_wakeup(&self->chan);
+	ppp_unregister_channel(&self->chan);
+      self->ppp_open = 0;
     }
   /* Cleanup the socket in case we want to reconnect */
   self->stsap_sel = 0;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)