Changeset 0773396 in mainline for uspace/lib/c/generic/iplink.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/lib/c/generic/iplink.c (modified) (2 diffs)

uspace/lib/c/generic/iplink.c

@@ -218 +218 @@
         iplink_recv_sdu_t sdu;
         
-        uint16_t af = IPC_GET_ARG1(*icall);
+        ip_ver_t ver = IPC_GET_ARG1(*icall);
         
         int rc = async_data_write_accept(&sdu.data, false, 0, 0, 0,
@@ -227 +227 @@
         }
         
-        rc = iplink->ev_ops->recv(iplink, &sdu, af);
+        rc = iplink->ev_ops->recv(iplink, &sdu, ver);
         free(sdu.data);
         async_answer_0(iid, rc);