Fork us on GitHub Follow us on Facebook Follow us on Twitter

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


Ignore:
Timestamp:
2012-06-03T20:45:58Z (10 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master
Children:
90478727
Parents:
f7e69f5 (diff), 3123d2a (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/srv/net/ethip/ethip.c

    rf7e69f5 re1e4192  
    7373static int ethip_init(void)
    7474{
    75         int rc;
    76 
    7775        async_set_client_connection(ethip_client_conn);
    78 
    79         rc = loc_server_register(NAME);
     76       
     77        int rc = loc_server_register(NAME);
    8078        if (rc != EOK) {
    8179                log_msg(LVL_ERROR, "Failed registering server.");
    8280                return rc;
    8381        }
    84 
     82       
    8583        rc = ethip_nic_discovery_start();
    8684        if (rc != EOK)
    8785                return rc;
    88 
     86       
    8987        return EOK;
    9088}
Note: See TracChangeset for help on using the changeset viewer.