From: Tomek Mrugalski <tomasz@isc.org>
Date: Sun, 1 Nov 2015 03:45:44 +0000 (+0900)
Subject: Merge fix.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7d970bb31f644ff0cb50cb5cfac490d20dc81b2f;p=thirdparty%2Fkea.git

Merge fix.
---

diff --git a/src/lib/dhcpsrv/subnet_selector.h b/src/lib/dhcpsrv/subnet_selector.h
index 368aa4ce92..b848f360ba 100644
--- a/src/lib/dhcpsrv/subnet_selector.h
+++ b/src/lib/dhcpsrv/subnet_selector.h
@@ -47,9 +47,6 @@ struct SubnetSelector {
     asiolink::IOAddress first_relay_linkaddr_;
     //@}
 
-    /// @name DHCPv4-over-DHCPv6 flag
-    bool dhcp4o6_;
-
     /// @brief Address on which the message was received.
     asiolink::IOAddress local_address_;
     /// @brief Source address of the message.
@@ -71,7 +68,6 @@ struct SubnetSelector {
           option_select_(asiolink::IOAddress("0.0.0.0")),
           interface_id_(),
           first_relay_linkaddr_(asiolink::IOAddress("::")),
-          dhcp4o6_(false),
           local_address_(asiolink::IOAddress("0.0.0.0")),
           remote_address_(asiolink::IOAddress("0.0.0.0")),
           client_classes_(), iface_name_(std::string()),