Changeset 0773396 in mainline for uspace/srv/net/slip/slip.c

Timestamp:

2013-12-25T13:05:25Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

bc54126c

Parents:

f4a47e52 (diff), 6946f23 (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

File:

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

uspace/srv/net/slip/slip.c

@@ -38 +38 @@
 #include <stdint.h>
 #include <loc.h>
-#include <net/socket_codes.h>
 #include <inet/addr.h>
 #include <inet/iplink_srv.h>
@@ -277 +276 @@
 
 pass:
-                rc = iplink_ev_recv(&slip_iplink, &sdu, AF_INET);
+                rc = iplink_ev_recv(&slip_iplink, &sdu, ip_v4);
                 if (rc != EOK) {
                         log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -333 +332 @@
                     "Failed to connect to service %s (ID=%d)",
                     svcstr, (int) svcid);
-                return rc;
+                return ENOENT;
         }
         slip_iplink.arg = sess_out;
@@ -342 +341 @@
                     "Failed to connect to service %s (ID=%d)",
                     svcstr, (int) svcid);
+                rc = ENOENT;
                 goto fail;
         }
@@ -365 +365 @@
                 log_msg(LOG_DEFAULT, LVL_ERROR,
                     "Failed to create receive fibril.");
+                rc = ENOENT;
                 goto fail;
         }