Changeset e6a78b9 in mainline for uspace/srv/net/ethip/ethip.c

Timestamp:

2012-06-29T15:31:44Z (12 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9432f08

Parents:

34ab31c (diff), 0bbd13e (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/ethip/ethip.c (modified) (1 diff)

uspace/srv/net/ethip/ethip.c

@@ -73 +73 @@
 static int ethip_init(void)
 {
-        int rc;
-
         async_set_client_connection(ethip_client_conn);
-
-        rc = loc_server_register(NAME);
+        
+        int rc = loc_server_register(NAME);
         if (rc != EOK) {
                 log_msg(LVL_ERROR, "Failed registering server.");
                 return rc;
         }
-
+        
         rc = ethip_nic_discovery_start();
         if (rc != EOK)
                 return rc;
-
+        
         return EOK;
 }