Changeset 7bdcc45 in mainline for uspace/srv/net/il/arp/arp.c

Timestamp:

2010-12-16T16:38:49Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7837101

Parents:

8e58f94 (diff), eb221e5 (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/il/arp/arp.c (modified) (4 diffs)

uspace/srv/net/il/arp/arp.c

@@ -320 +320 @@
                 /* Bind the new one */
                 device->phone = nil_bind_service(device->service,
-                    (ipcarg_t) device->device_id, SERVICE_ARP,
+                    (sysarg_t) device->device_id, SERVICE_ARP,
                     arp_globals.client_connection);
                 if (device->phone < 0) {
@@ -421 +421 @@
         device->packet_dimension.content = mtu;
         fibril_mutex_unlock(&arp_globals.lock);
-        printf("arp - device %d changed mtu to %d\n\n", device_id, mtu);
+        printf("arp - device %d changed mtu to %zu\n\n", device_id, mtu);
         return EOK;
 }
@@ -695 +695 @@
         
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -815 +815 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP))
                         return;