Changeset 8b5690f in mainline for uspace/lib/net/il/ip_remote.c

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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/net/il/ip_remote.c (modified) (5 diffs)

uspace/lib/net/il/ip_remote.c

@@ -36 +36 @@
  *
  * @see ip_interface.h
- * @see il_interface.h
+ * @see il_remote.h
  *
  */
@@ -121 +121 @@
     services_t service)
 {
-        return generic_device_req_remote(ip_phone, NET_IL_DEVICE, device_id, 0,
+        return generic_device_req_remote(ip_phone, NET_IP_DEVICE, device_id, 0,
             service);
 }
@@ -170 +170 @@
                 free(*header);
         else
-                *device_id = IPC_GET_DEVICE(&answer);
+                *device_id = IPC_GET_DEVICE(answer);
         
         return (int) result;
@@ -188 +188 @@
     packet_dimension_t *packet_dimension)
 {
-        return generic_packet_size_req_remote(ip_phone, NET_IL_PACKET_SPACE,
+        return generic_packet_size_req_remote(ip_phone, NET_IP_PACKET_SPACE,
             device_id, packet_dimension);
 }
@@ -228 +228 @@
     services_t sender, services_t error)
 {
-        return generic_send_msg_remote(ip_phone, NET_IL_SEND, device_id,
+        return generic_send_msg_remote(ip_phone, NET_IP_SEND, device_id,
             packet_get_id(packet), sender, error);
 }