Changeset 4c14b88 in mainline for uspace/srv/net/ethip/ethip.c

Timestamp:

2013-12-31T07:57:14Z (10 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

1b973dc

Parents:

6297465 (diff), 208b5f5 (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:

mainline changes

File:

• uspace/srv/net/ethip/ethip.c (modified) (3 diffs)

uspace/srv/net/ethip/ethip.c

@@ -44 +44 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include "arp.h"
 #include "ethip.h"
@@ -249 +248 @@
                 sdu.size = frame.size;
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - call iplink_ev_recv");
-                rc = iplink_ev_recv(&nic->iplink, &sdu, AF_INET);
+                rc = iplink_ev_recv(&nic->iplink, &sdu, ip_v4);
                 break;
         case ETYPE_IPV6:
@@ -256 +255 @@
                 sdu.size = frame.size;
                 log_msg(LOG_DEFAULT, LVL_DEBUG, " - call iplink_ev_recv");
-                rc = iplink_ev_recv(&nic->iplink, &sdu, AF_INET6);
+                rc = iplink_ev_recv(&nic->iplink, &sdu, ip_v6);
                 break;
         default: