Changeset ee1c2d9 in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

2015-06-13T18:30:18Z (9 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a157846

Parents:

0453261 (diff), 2f9a8e8 (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:

mainline changes

File:

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

uspace/srv/net/dhcp/dhcp.c

@@ -37 +37 @@
 #include <adt/list.h>
 #include <bitops.h>
+#include <byteorder.h>
 #include <errno.h>
 #include <fibril_synch.h>
@@ -562 +563 @@
         }
 
-        /* XXX Work around multiple simultaneous sessions issue */
-        dhcp_transport_fini(&dlink->dt);
-
         log_msg(LOG_DEFAULT, LVL_NOTE, "%s: Successfully configured.",
             dlink->link_info.name);