aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dcbw@redhat.com>2013-02-15 13:42:48 -0600
committerDan Williams <dcbw@redhat.com>2013-02-15 13:48:45 -0600
commitcffdb733002546b0cfa6d529f23f1777b8acd9ad (patch)
treeeca1928b438d9ab4ecf8410b7c9ad1060f1459db
parent034279f26960fe009816d1474473b6fbcfcd67bf (diff)
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.
-rw-r--r--src/mm-serial-port.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/mm-serial-port.c b/src/mm-serial-port.c
index 36f401ae..497d14cb 100644
--- a/src/mm-serial-port.c
+++ b/src/mm-serial-port.c
@@ -713,10 +713,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;