From 3bdd2d7429c049fc5925e12884f8eea0c34dcd22 Mon Sep 17 00:00:00 2001 From: Thomas Graf Date: Wed, 7 Dec 2011 13:15:19 +0100 Subject: [PATCH] ethernet: check kernel interface binding when matching config When matching an ethernet device with connection settings, check if the connection needs to be bound to a specific virtual kernel interface. Signed-off-by: Thomas Graf --- src/nm-device-ethernet.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/nm-device-ethernet.c b/src/nm-device-ethernet.c index 4951c943d6..3751180bea 100644 --- a/src/nm-device-ethernet.c +++ b/src/nm-device-ethernet.c @@ -1535,6 +1535,11 @@ connection_match_config (NMDevice *self, const GSList *connections) wired_matches = NULL; for (iter = connections; iter; iter = iter->next) { NMConnection *candidate = NM_CONNECTION (iter->data); + const char *iface; + + iface = nm_connection_get_virtual_iface_name (candidate); + if (iface && strcmp (nm_device_get_iface (self), iface)) + continue; s_con = nm_connection_get_setting_connection (candidate); g_assert (s_con);