Changeset 0773396 in mainline for uspace/srv/net/loopip/loopip.c

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/srv/net/loopip/loopip.c (modified) (5 diffs)

uspace/srv/net/loopip/loopip.c

@@ -40 +40 @@
 #include <inet/iplink_srv.h>
 #include <inet/addr.h>
-#include <net/socket_codes.h>
 #include <io/log.h>
 #include <loc.h>
@@ -76 +75 @@
         link_t link;
         
-        uint16_t af;
+        /* XXX Version should be part of SDU */
+        ip_ver_t ver;
         iplink_recv_sdu_t sdu;
 } rqueue_entry_t;
@@ -88 +88 @@
                     list_get_instance(link, rqueue_entry_t, link);
                 
-                (void) iplink_ev_recv(&loopip_iplink, &rqe->sdu, rqe->af);
+                (void) iplink_ev_recv(&loopip_iplink, &rqe->sdu, rqe->ver);
                 
                 free(rqe->sdu.data);
@@ -174 +174 @@
          * Clone SDU
          */
-        rqe->af = AF_INET;
+        rqe->ver = ip_v4;
         rqe->sdu.data = malloc(sdu->size);
         if (rqe->sdu.data == NULL) {
@@ -203 +203 @@
          * Clone SDU
          */
-        rqe->af = AF_INET6;
+        rqe->ver = ip_v6;
         rqe->sdu.data = malloc(sdu->size);
         if (rqe->sdu.data == NULL) {