X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdhcp-client.c;h=74fa44c53b66c986862729f5e104be29450d89fb;hb=7507ec485f72c2ec56731ee5c9790a20d6d694fd;hp=7168361f00e3c0757a38c61541b8b1a982dc8c60;hpb=c2e01f64e7ed6c0c0ae0a160daf3f2704f43bad8;p=sliver-openvswitch.git

diff --git a/lib/dhcp-client.c b/lib/dhcp-client.c
index 7168361f0..74fa44c53 100644
--- a/lib/dhcp-client.c
+++ b/lib/dhcp-client.c
@@ -35,10 +35,10 @@
 #include "poll-loop.h"
 #include "sat-math.h"
 #include "timeval.h"
-
-#define THIS_MODULE VLM_dhcp_client
 #include "vlog.h"
 
+VLOG_DEFINE_THIS_MODULE(dhcp_client);
+
 #define DHCLIENT_STATES                         \
     DHCLIENT_STATE(INIT, 1 << 0)                \
     DHCLIENT_STATE(INIT_REBOOT, 1 << 1)         \
@@ -851,7 +851,7 @@ state_transition(struct dhclient *cli, enum dhclient_state state)
     bool am_bound;
 
     if (cli->state != state) {
-        VLOG_DBG("%s: entering %s", cli_name, state_name(state)); 
+        VLOG_DBG("%s: entering %s", cli_name, state_name(state));
         cli->state = state;
     }
     cli->state_entered = time_now();
@@ -942,7 +942,7 @@ do_receive_msg(struct dhclient *cli, struct dhcp_msg *msg)
     for (; cli->received < 50; cli->received++) {
         const struct ip_header *ip;
         const struct dhcp_header *dhcp;
-        flow_t flow;
+        struct flow flow;
         int error;
 
         ofpbuf_clear(&b);
@@ -980,7 +980,7 @@ do_receive_msg(struct dhclient *cli, struct dhcp_msg *msg)
         if (!error) {
             if (VLOG_IS_DBG_ENABLED()) {
                 VLOG_DBG_RL(&rl, "%s: received %s", cli_name,
-                            dhcp_msg_to_string(msg, false, &cli->s)); 
+                            dhcp_msg_to_string(msg, false, &cli->s));
             } else {
                 VLOG_INFO_RL(&rl, "%s: received %s",
                              cli_name, dhcp_type_name(msg->type));
@@ -1062,7 +1062,7 @@ do_send_msg(struct dhclient *cli, const struct dhcp_msg *msg)
     if (b.size <= ETH_TOTAL_MAX) {
         if (VLOG_IS_DBG_ENABLED()) {
             VLOG_DBG("%s: sending %s",
-                     cli_name, dhcp_msg_to_string(msg, false, &cli->s)); 
+                     cli_name, dhcp_msg_to_string(msg, false, &cli->s));
         } else {
             VLOG_INFO("%s: sending %s", cli_name, dhcp_type_name(msg->type));
         }