Changeset 7bdcc45 in mainline for uspace/srv/net/il/ip/ip.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/ip/ip.c (modified) (5 diffs)

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

@@ -430 +430 @@
         // binds the netif service which also initializes the device
         ip_netif->phone = nil_bind_service(ip_netif->service,
-            (ipcarg_t) ip_netif->device_id, SERVICE_IP,
+            (sysarg_t) ip_netif->device_id, SERVICE_IP,
             ip_globals.client_connection);
         if (ip_netif->phone < 0) {
@@ -461 +461 @@
         
         if (ip_netif->packet_dimension.content < IP_MIN_CONTENT) {
-                printf("Maximum transmission unit %d bytes is too small, at "
+                printf("Maximum transmission unit %zu bytes is too small, at "
                     "least %d bytes are needed\n",
                     ip_netif->packet_dimension.content, IP_MIN_CONTENT);
@@ -502 +502 @@
         fibril_rwlock_write_unlock(&ip_globals.netifs_lock);
 
-        printf("%s: Device %d changed MTU to %d\n", NAME, device_id, mtu);
+        printf("%s: Device %d changed MTU to %zu\n", NAME, device_id, mtu);
 
         return EOK;
@@ -1902 +1902 @@
         
         *answer_count = 0;
-        switch (IPC_GET_METHOD(*call)) {
+        switch (IPC_GET_IMETHOD(*call)) {
         case IPC_M_PHONE_HUNGUP:
                 return EOK;
@@ -2025 +2025 @@
                  * result.
                  */
-                if ((IPC_GET_METHOD(call) == IPC_M_PHONE_HUNGUP) ||
+                if ((IPC_GET_IMETHOD(call) == IPC_M_PHONE_HUNGUP) ||
                     (res == EHANGUP)) {
                         return;