diff --git a/ChangeLog b/ChangeLog
index 28412ed3b7..e4101e7978 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2008-04-16  Dan Williams  <dcbw@redhat.com>
+
+	Patch from 陈鑫 <znscnchen@gmail.com>
+
+	* 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  <dcbw@redhat.com>
 
 	* 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;