Changeset 0c2d9bb in mainline for uspace/lib/c/generic/iplink_srv.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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_srv.c (modified) (2 diffs)

uspace/lib/c/generic/iplink_srv.c

@@ -272 +272 @@
 }
 
-int iplink_ev_recv(iplink_srv_t *srv, iplink_recv_sdu_t *sdu, uint16_t af)
+/* XXX Version should be part of @a sdu */
+int iplink_ev_recv(iplink_srv_t *srv, iplink_recv_sdu_t *sdu, ip_ver_t ver)
 {
         if (srv->client_sess == NULL)
@@ -280 +281 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_1(exch, IPLINK_EV_RECV, (sysarg_t) af,
+        aid_t req = async_send_1(exch, IPLINK_EV_RECV, (sysarg_t)ver,
             &answer);