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

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/include/inet/inet.h (modified) (2 diffs)

uspace/lib/c/include/inet/inet.h

@@ -37 +37 @@
 
 #include <inet/addr.h>
+#include <ipc/loc.h>
 #include <sys/types.h>
 
@@ -42 +43 @@
 
 typedef struct {
+        /** Local IP link service ID (optional) */
+        service_id_t iplink;
         inet_addr_t src;
         inet_addr_t dest;