Changeset 3f03199 in mainline for uspace/srv/net/slip/slip.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/srv/net/slip/slip.c (modified) (3 diffs)

uspace/srv/net/slip/slip.c

@@ -333 +333 @@
                     "Failed to connect to service %s (ID=%d)",
                     svcstr, (int) svcid);
-                return rc;
+                return ENOENT;
         }
         slip_iplink.arg = sess_out;
@@ -342 +342 @@
                     "Failed to connect to service %s (ID=%d)",
                     svcstr, (int) svcid);
+                rc = ENOENT;
                 goto fail;
         }
@@ -365 +366 @@
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Failed to create receive fibril.");
+                rc = ENOENT;
                 goto fail;
         }