Changeset 8b655705 in mainline for uspace/srv/net/nil/eth/eth.c

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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/nil/eth/eth.c (modified) (5 diffs)

uspace/srv/net/nil/eth/eth.c

@@ -43 +43 @@
 #include <str.h>
 #include <errno.h>
-
-#include <ipc/ipc.h>
 #include <ipc/nil.h>
 #include <ipc/net.h>
 #include <ipc/services.h>
-
 #include <net/modules.h>
 #include <net_checksum.h>
@@ -217 +214 @@
         if (rc != EOK) {
                 free(eth_globals.broadcast_addr);
-                eth_devices_destroy(&eth_globals.devices);
+                eth_devices_destroy(&eth_globals.devices, free);
         }
 out:
@@ -242 +239 @@
                         nil_device_state_msg_local(0, IPC_GET_DEVICE(*icall),
                             IPC_GET_STATE(*icall));
-                        ipc_answer_0(iid, EOK);
+                        async_answer_0(iid, EOK);
                         break;
                 case NET_NIL_RECEIVED:
@@ -251 +248 @@
                                     IPC_GET_DEVICE(*icall), packet, 0);
                         
-                        ipc_answer_0(iid, (sysarg_t) rc);
+                        async_answer_0(iid, (sysarg_t) rc);
                         break;
                 default:
-                        ipc_answer_0(iid, (sysarg_t) ENOTSUP);
+                        async_answer_0(iid, (sysarg_t) ENOTSUP);
                 }
                 
@@ -534 +531 @@
                             proto->service);
                 } else {
-                        // drop invalid/unknown
+                        /* Drop invalid/unknown */
                         pq_release_remote(eth_globals.net_phone,
                             packet_get_id(packet));