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

Timestamp:

2011-04-07T21:38:17Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

033cbf82

Parents:

3acb285 (diff), ccca251 (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) (2 diffs)

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

@@ -214 +214 @@
         if (rc != EOK) {
                 free(eth_globals.broadcast_addr);
-                eth_devices_destroy(&eth_globals.devices);
+                eth_devices_destroy(&eth_globals.devices, free);
         }
 out:
@@ -531 +531 @@
                             proto->service);
                 } else {
-                        // drop invalid/unknown
+                        /* Drop invalid/unknown */
                         pq_release_remote(eth_globals.net_phone,
                             packet_get_id(packet));