datapath: Allow jumbograms through IPv6 parsing.

[openvswitch] / lib / dhcp-client.c

diff --git a/lib/dhcp-client.c b/lib/dhcp-client.c
index b9ebefe09b7aa9600a3636228e4b44f5bacc1fad..a0999bf4772806002b50d849957c265b9ccbea64 100644 (file)
--- a/lib/dhcp-client.c
+++ b/lib/dhcp-client.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009, 2010 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -894,7 +894,6 @@ send_reliably(struct dhclient *cli,
         do_send_msg(cli, &msg);
         cli->delay = MIN(cli->max_timeout, MAX(4, cli->delay * 2));
         cli->retransmit += fuzz(cli->delay, 1);
-        timeout(cli, cli->retransmit);
         dhcp_msg_uninit(&msg);
      }
 }
@@ -934,10 +933,8 @@ do_receive_msg(struct dhclient *cli, struct dhcp_msg *msg)
     const char *cli_name = dhclient_get_name(cli);
     uint8_t cli_mac[ETH_ADDR_LEN];
     struct ofpbuf b;
-    int mtu;
 
-    netdev_get_mtu(cli->netdev, &mtu);
-    ofpbuf_init(&b, mtu + VLAN_ETH_HEADER_LEN);
+    ofpbuf_init(&b, ETH_TOTAL_MAX + VLAN_ETH_HEADER_LEN);
     netdev_get_etheraddr(cli->netdev, cli_mac);
     for (; cli->received < 50; cli->received++) {
         const struct ip_header *ip;