Changeset 8565a42 in mainline for uspace/srv/net/dhcp/dhcp.c
- Timestamp:
- 2018-03-02T20:34:50Z (8 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- a1a81f69, d5e5fd1
- Parents:
- 3061bc1 (diff), 34e1206 (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. - git-author:
- Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-02 20:34:50)
- git-committer:
- GitHub <noreply@…> (2018-03-02 20:34:50)
- File:
-
- 1 edited
-
uspace/srv/net/dhcp/dhcp.c (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
uspace/srv/net/dhcp/dhcp.c
r3061bc1 r8565a42 430 430 431 431 dlink->retries_left = dhcp_discover_retries; 432 432 433 433 if ((dlink->timeout->state == fts_not_set) || 434 434 (dlink->timeout->state == fts_fired)) 435 435 fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val, 436 436 dhcpsrv_discover_timeout, dlink); 437 437 438 438 return rc; 439 439 } … … 507 507 { 508 508 log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id); 509 509 510 510 dhcp_link_t *dlink = dhcpsrv_link_find(link_id); 511 511 512 512 if (dlink == NULL) { 513 513 log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu doesn't exist", … … 515 515 return EINVAL; 516 516 } 517 517 518 518 return dhcp_discover_proc(dlink); 519 519 }
Note:
See TracChangeset
for help on using the changeset viewer.
