Changeset 0773396 in mainline for uspace/lib/c/generic/inet.c

Timestamp:

2013-12-25T13:05:25Z (12 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/inet.c (modified) (2 diffs)

uspace/lib/c/generic/inet.c

@@ -30 +30 @@
 #include <assert.h>
 #include <errno.h>
-#include <net/socket_codes.h>
 #include <inet/inet.h>
 #include <ipc/inet.h>
@@ -111 +110 @@
         
         ipc_call_t answer;
-        aid_t req = async_send_3(exch, INET_SEND, dgram->tos, ttl, df,
-            &answer);
+        aid_t req = async_send_4(exch, INET_SEND, dgram->iplink, dgram->tos,
+            ttl, df, &answer);
         
         int rc = async_data_write_start(exch, &dgram->src, sizeof(inet_addr_t));