Drop debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch

This patch is obsolete, since upstream provides a udev rules based
mechanism now to mark virtual interfaces as unmanaged.

Closes: #794083

3 files changed, 3 insertions, 70 deletions

diff --git a/debian/changelog b/debian/changelog
index e0cb4535d..8b8e1b9ef 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ network-manager (1.0.6-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Refresh patches.
   * Update symbols file for libnm0 and libnm-glib4.
+  * Drop debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch,
+    this patch is obsolete, since upstream provides a udev rules based
+    mechanism now to mark virtual interfaces as unmanaged. (Closes: #794083)
 
  -- Michael Biebl <biebl@debian.org>  Fri, 28 Aug 2015 01:14:04 +0200
 
diff --git a/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch b/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch
deleted file mode 100644
index 56fb1ee79..000000000
--- a/debian/patches/Mark-virtual-ethernet-interfaces-as-unmanaged.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From: Michael Biebl <biebl@debian.org>
-Date: Thu, 10 Jul 2014 03:38:42 +0200
-Subject: Mark virtual ethernet interfaces as unmanaged
-
-We do not want to interfere with VBox and VMware network interfaces, so ignore
-any virtual ethernet interfaces and mark them as unmanaged.
----
- src/devices/nm-device-ethernet.c | 41 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 41 insertions(+)
-
-diff --git a/src/devices/nm-device-ethernet.c b/src/devices/nm-device-ethernet.c
-index beb86e1..6148b8d 100644
---- a/src/devices/nm-device-ethernet.c
-+++ b/src/devices/nm-device-ethernet.c
-@@ -241,6 +241,45 @@ out:
- 		g_object_unref (dev);
- }
- 
-+static void
-+nm_device_check_virtual (NMDeviceEthernet *self)
-+{
-+	GUdevDevice *dev = NULL;
-+	GUdevClient *client = NULL;
-+	const char *iface = NULL;
-+	const char *subsystems[] = { "net", NULL };
-+	const char *sysfs_path;
-+	const char *virtual = "/sys/devices/virtual/net";
-+
-+	iface = nm_device_get_iface (NM_DEVICE (self));
-+
-+	client = g_udev_client_new (subsystems);
-+	if (!client) {
-+		nm_log_warn (LOGD_DEVICE | LOGD_HW, "(%s): failed to initialize GUdev client", iface);
-+		goto out;
-+	}
-+
-+	dev = g_udev_client_query_by_subsystem_and_name (client, "net", iface);
-+	if (!dev) {
-+		nm_log_warn (LOGD_DEVICE | LOGD_HW, "(%s): failed to find device with udev", iface);
-+		goto out;
-+	}
-+
-+	sysfs_path = g_udev_device_get_sysfs_path (dev);
-+
-+	if (g_ascii_strncasecmp (sysfs_path, virtual, strlen (virtual)) == 0) {
-+		nm_log_info (LOGD_DEVICE | LOGD_HW, "(%s): device is virtual, marking as unmanaged", iface);
-+		nm_device_set_initial_unmanaged_flag (NM_DEVICE (self), NM_UNMANAGED_DEFAULT, TRUE);
-+	}
-+
-+out:
-+	if (client)
-+		g_object_unref (client);
-+	if (dev)
-+		g_object_unref (dev);
-+}
-+
-+
- static GObject*
- constructor (GType type,
-              guint n_construct_params,
-@@ -263,6 +302,8 @@ constructor (GType type,
- 
- 		/* s390 stuff */
- 		_update_s390_subchannels (NM_DEVICE_ETHERNET (object));
-+
-+		nm_device_check_virtual (NM_DEVICE_ETHERNET (object));
- 	}
- 
- 	return object;
diff --git a/debian/patches/series b/debian/patches/series
index 1a072f1d0..fe7351d91 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@ Debian-specific-tweaks-for-NetworkManager-systemd-se.patch
 Force-online-state-with-unmanaged-devices.patch
 Don-t-setup-Sleep-Monitor-if-not-booted-with-systemd.patch
 Use-symlinks-for-nmtui.patch
-Mark-virtual-ethernet-interfaces-as-unmanaged.patch
 Use-the-correct-path-when-calling-dnssec-trigger-scr.patch
 fix-arping-path.patch
 Check-at-runtime-whether-to-start-ModemManager.patch