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

Changeset e1e4192 in mainline for uspace/srv/net/ethip/ethip_nic.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_nic.c

    rf7e69f5 re1e4192  
    150150static int ethip_nic_open(service_id_t sid)
    151151{
    152         ethip_nic_t *nic;
    153         int rc;
    154152        bool in_list = false;
    155153        nic_address_t nic_address;
    156 
     154       
    157155        log_msg(LVL_DEBUG, "ethip_nic_open()");
    158         nic = ethip_nic_new();
     156        ethip_nic_t *nic = ethip_nic_new();
    159157        if (nic == NULL)
    160158                return ENOMEM;
    161 
    162         rc = loc_service_get_name(sid, &nic->svc_name);
     159       
     160        int rc = loc_service_get_name(sid, &nic->svc_name);
    163161        if (rc != EOK) {
    164162                log_msg(LVL_ERROR, "Failed getting service name.");
    165163                goto error;
    166164        }
    167 
     165       
    168166        nic->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
    169167        if (nic->sess == NULL) {
     
    171169                goto error;
    172170        }
    173 
     171       
    174172        nic->svc_id = sid;
    175 
     173       
    176174        rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic);
    177175        if (rc != EOK) {
     
    298296int ethip_nic_discovery_start(void)
    299297{
    300         int rc;
    301 
    302         rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb);
     298        int rc = loc_register_cat_change_cb(ethip_nic_cat_change_cb);
    303299        if (rc != EOK) {
    304300                log_msg(LVL_ERROR, "Failed registering callback for NIC "
     
    306302                return rc;
    307303        }
    308 
     304       
    309305        return ethip_nic_check_new();
    310306}
Note: See TracChangeset for help on using the changeset viewer.