From 217cccd22aa9ab7a1182905400da68be1bdce3aa Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 16 Apr 2008 19:47:24 +0000 Subject: [PATCH] 2008-04-16 Dan Williams MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch from 陈鑫 * src/nm-device-802-3-ethernet.c - (real_deactivate_quickly): clear the IP interface name on deactivation, otherwise the wrong interface might get used later for routing and IP management git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3567 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 9 +++++++++ src/nm-device-802-3-ethernet.c | 2 ++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 28412ed3b7..e4101e7978 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-04-16 Dan Williams + + Patch from 陈鑫 + + * src/nm-device-802-3-ethernet.c + - (real_deactivate_quickly): clear the IP interface name on + deactivation, otherwise the wrong interface might get used later + for routing and IP management + 2008-04-15 Dan Williams * libnm-glib/nm-device.c diff --git a/src/nm-device-802-3-ethernet.c b/src/nm-device-802-3-ethernet.c index 63432bb91a..45df7e45ac 100644 --- a/src/nm-device-802-3-ethernet.c +++ b/src/nm-device-802-3-ethernet.c @@ -1218,6 +1218,8 @@ real_deactivate_quickly (NMDevice *device) { NMDevice8023EthernetPrivate *priv = NM_DEVICE_802_3_ETHERNET_GET_PRIVATE (device); + nm_device_set_ip_iface (device, NULL); + if (priv->pending_ip4_config) { g_object_unref (priv->pending_ip4_config); priv->pending_ip4_config = NULL;