Merge fix.

diff --git a/src/lib/dhcpsrv/subnet_selector.h b/src/lib/dhcpsrv/subnet_selector.h
index 368aa4ce9279ab0e8b8a0fe551ca19d5f77322d9..b848f360bafcf1281b9ce85967444ccf42edc730 100644 (file)
--- 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()),