Changeset 3f03199 in mainline for uspace/lib/c/generic/inet.c

Timestamp:

2013-09-15T06:33:53Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9348862

Parents:

dd7078c (diff), 1c0cef0 (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.

Major conflicts in USB HC drivers.
Compiles and UHCI works (qemu).
OHCI has device remove problems.

File:

• uspace/lib/c/generic/inet.c (modified) (1 diff)

uspace/lib/c/generic/inet.c

@@ -111 +111 @@
         
         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));