Changeset bbc74af7 in mainline for uspace/srv/net/nil/eth

Timestamp:

2010-12-16T20:21:45Z (15 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

40dc422, 87b4baac

Parents:

eb221e5 (diff), cc274f5a (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 from lp:~jakub/helenos/net.

Location:

uspace/srv/net/nil/eth

Files:

• eth.c (modified) (1 diff)
• eth_module.c (modified) (1 diff)

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

@@ -201 +201 @@
 
         eth_globals.broadcast_addr =
-            measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF",
-            CONVERT_SIZE(uint8_t, char, ETH_ADDR));
+            measured_string_create_bulk("\xFF\xFF\xFF\xFF\xFF\xFF", ETH_ADDR);
         if (!eth_globals.broadcast_addr) {
                 rc = ENOMEM;

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

@@ -66 +66 @@
                 goto out;
 
-        rc = REGISTER_ME(SERVICE_ETHERNET, &phonehash);
+        rc = ipc_connect_to_me(PHONE_NS, SERVICE_ETHERNET, 0, 0, &phonehash);
         if (rc != EOK)
                 goto out;