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

Timestamp:

2015-11-02T20:54:19Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d8513177

Parents:

3feeab2 (diff), 5265eea4 (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) (3 diffs)

uspace/srv/net/slip/slip.c

@@ -300 +300 @@
         slip_iplink.ops = &slip_iplink_ops;
 
-        async_set_client_connection(slip_client_conn);
+        async_set_fallback_port_handler(slip_client_conn, NULL);
 
         rc = loc_server_register(NAME);
@@ -328 +328 @@
          * char_dev at the same time.
          */
-        sess_out = loc_service_connect(EXCHANGE_SERIALIZE, svcid, 0);
+        sess_out = loc_service_connect(svcid, INTERFACE_DDF, 0);
         if (!sess_out) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,
@@ -337 +337 @@
         slip_iplink.arg = sess_out;
 
-        sess_in = loc_service_connect(EXCHANGE_SERIALIZE, svcid, 0);
+        sess_in = loc_service_connect(svcid, INTERFACE_DDF, 0);
         if (!sess_in) {
                 log_msg(LOG_DEFAULT, LVL_ERROR,