Changeset 0c2d9bb in mainline for uspace/srv/net/inetsrv/pdu.c

Timestamp:

2013-12-25T22:54:29Z (10 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

b51cf2c

Parents:

f7a33de (diff), ac36aed (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/inetsrv/pdu.c (modified) (2 diffs)

uspace/srv/net/inetsrv/pdu.c

@@ -44 +44 @@
 #include <mem.h>
 #include <stdlib.h>
-#include <net/socket_codes.h>
 #include "inetsrv.h"
 #include "inet_std.h"
@@ -533 +532 @@
 int ndp_pdu_decode(inet_dgram_t *dgram, ndp_packet_t *ndp)
 {
-        uint16_t src_af = inet_addr_get(&dgram->src, NULL,
+        ip_ver_t src_ver = inet_addr_get(&dgram->src, NULL,
             &ndp->sender_proto_addr);
-        if (src_af != AF_INET6)
+        if (src_ver != ip_v6)
                 return EINVAL;