Changes in uspace/srv/net/dhcp/dhcp.c [053fc2b:78192cc7] in mainline

File:

• uspace/srv/net/dhcp/dhcp.c (modified) (4 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -418 +418 @@
 }
 
-static int dhcp_discover_proc(dhcp_link_t *dlink)
-{
-        dlink->state = ds_selecting;
-
-        int rc = dhcp_send_discover(dlink);
-        if (rc != EOK)
-                return EIO;
-
-        dlink->retries_left = dhcp_discover_retries;
-        
-        if(dlink->timeout->state == fts_not_set || 
-                dlink->timeout->state == fts_fired) {
-                fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,
-                        dhcpsrv_discover_timeout, dlink);
-        }
-        
-        return rc;
-}
-
 int dhcpsrv_link_add(service_id_t link_id)
 {
@@ -478 +459 @@
         }
 
+        dlink->state = ds_selecting;
+
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Send DHCPDISCOVER");
-        rc = dhcp_discover_proc(dlink);
+        rc = dhcp_send_discover(dlink);
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error sending DHCPDISCOVER.");
@@ -486 +469 @@
                 goto error;
         }
+
+        dlink->retries_left = dhcp_discover_retries;
+        fibril_timer_set(dlink->timeout, dhcp_discover_timeout_val,
+            dhcpsrv_discover_timeout, dlink);
 
         list_append(&dlink->links, &dhcp_links);
@@ -500 +487 @@
 {
         return ENOTSUP;
-}
-
-int dhcpsrv_discover(service_id_t link_id)
-{
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
-        
-        dhcp_link_t *dlink = dhcpsrv_link_find(link_id);
-
-        if (dlink == NULL) {
-                log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu doesn't exist",
-                    link_id);
-                return EINVAL;
-        }
-        
-        return dhcp_discover_proc(dlink);
 }