Changeset 0773396 in mainline for uspace/lib/c/include/inet/iplink.h

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

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

@@ -37 +37 @@
 
 #include <async.h>
-#include <sys/types.h>
 #include <inet/addr.h>
 
@@ -78 +77 @@
 
 typedef struct iplink_ev_ops {
-        int (*recv)(iplink_t *, iplink_recv_sdu_t *, uint16_t);
+        int (*recv)(iplink_t *, iplink_recv_sdu_t *, ip_ver_t);
 } iplink_ev_ops_t;