Changeset 76ca3f7 in mainline for uspace/srv/net/il/ip/ip.c

Timestamp:

2010-03-23T20:49:54Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

e417b96

Parents:

b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

File:

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

uspace/srv/net/il/ip/ip.c

@@ -40 +40 @@
 #include <fibril_synch.h>
 #include <stdio.h>
-#include <string.h>
+#include <str.h>
 
 #include <ipc/ipc.h>
@@ -895 +895 @@
         ip_pseudo_header_ref header;
         size_t headerlen;
+        device_id_t device_id;
 
         *answer_count = 0;
@@ -921 +922 @@
                 case NET_IP_GET_ROUTE:
                         ERROR_PROPAGATE(data_receive((void **) &addr, &addrlen));
-                        ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen, IPC_SET_DEVICE(answer), &header, &headerlen));
+                        ERROR_PROPAGATE(ip_get_route_req(0, IP_GET_PROTOCOL(call), addr, (socklen_t) addrlen,
+                            &device_id, &header, &headerlen));
+                        *IPC_SET_DEVICE(answer) = device_id;
                         *IP_SET_HEADERLEN(answer) = headerlen;
                         *answer_count = 2;