Merge remote-tracking branch 'salsa/master'

1 files changed, 0 insertions, 13 deletions

diff --git a/src/dhcp/nm-dhcp-nettools.c b/src/dhcp/nm-dhcp-nettools.c
index 3aa92180..9a0c6906 100644
--- a/src/dhcp/nm-dhcp-nettools.c
+++ b/src/dhcp/nm-dhcp-nettools.c
@@ -1208,18 +1208,6 @@ ip4_start (NMDhcpClient *client,
 	return TRUE;
 }
 
-static gboolean
-ip6_start (NMDhcpClient *client,
-           const char *dhcp_anycast_addr,
-           const struct in6_addr *ll_addr,
-           NMSettingIP6ConfigPrivacy privacy,
-           guint needed_prefixes,
-           GError **error)
-{
-	nm_utils_error_set_literal (error, NM_UTILS_ERROR_UNKNOWN, "nettools plugin does not support IPv6");
-	return FALSE;
-}
-
 static void
 stop (NMDhcpClient *client,
       gboolean release)
@@ -1265,7 +1253,6 @@ nm_dhcp_nettools_class_init (NMDhcpNettoolsClass *class)
 	object_class->dispose = dispose;
 
 	client_class->ip4_start = ip4_start;
-	client_class->ip6_start = ip6_start;
 	client_class->accept = _accept;
 	client_class->decline = decline;
 	client_class->stop = stop;