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

Timestamp:

2012-07-10T11:53:50Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

1e01a35

Parents:

a33706e (diff), 33fc3ae (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;
 }