From 5280364c4bfc0e84ccac9abbc02c82d46db5034a Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 15 Feb 2013 13:42:48 -0600 Subject: Revert "serial-port: don't steal data from PPP when connected" This reverts commit 625e1c4884215bb9989dad6c9868c06ba76a4d94. By simply returning when data is available, no data gets cleared from the file descriptor and data_available() keeps getting rescheduled, leading to a busy-loop. This is the wrong approach, we should be removing the GIOChannel watch instead. --- src/mm-serial-port.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src') diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c index 2971273e..87f06e27 100644 --- a/src/mm-serial-port.c +++ b/src/mm-serial-port.c @@ -767,10 +767,6 @@ data_available (GIOChannel *source, if (info && (info->started == TRUE) && (info->done == FALSE)) return TRUE; - /* Don't steal data from PPP if we're connected */ - if (mm_port_get_connected (MM_PORT (self))) - return TRUE; - do { GError *err = NULL; -- cgit v1.2.3-70-g09d2