Changeset b4ca0a9c in mainline for uspace/srv/net/ethip/ethip_nic.c
- Timestamp:
- 2012-07-10T11:53:50Z (12 years ago)
- 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. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/ethip/ethip_nic.c
ra33706e rb4ca0a9c 150 150 static int ethip_nic_open(service_id_t sid) 151 151 { 152 ethip_nic_t *nic;153 int rc;154 152 bool in_list = false; 155 153 nic_address_t nic_address; 156 154 157 155 log_msg(LVL_DEBUG, "ethip_nic_open()"); 158 nic = ethip_nic_new();156 ethip_nic_t *nic = ethip_nic_new(); 159 157 if (nic == NULL) 160 158 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); 163 161 if (rc != EOK) { 164 162 log_msg(LVL_ERROR, "Failed getting service name."); 165 163 goto error; 166 164 } 167 165 168 166 nic->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0); 169 167 if (nic->sess == NULL) { … … 171 169 goto error; 172 170 } 173 171 174 172 nic->svc_id = sid; 175 173 176 174 rc = nic_callback_create(nic->sess, ethip_nic_cb_conn, nic); 177 175 if (rc != EOK) { … … 298 296 int ethip_nic_discovery_start(void) 299 297 { 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); 303 299 if (rc != EOK) { 304 300 log_msg(LVL_ERROR, "Failed registering callback for NIC " … … 306 302 return rc; 307 303 } 308 304 309 305 return ethip_nic_check_new(); 310 306 }
Note:
See TracChangeset
for help on using the changeset viewer.