mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
Revert "device: restart DHCP when the MAC changes"
The commit causes problems with bridges. When a new port is attached
the MAC of the bridge possibly changes and if we restart DHCP the
bridge will get a different IP address.
Revert the change until a better solution to the original problem is
found.
This reverts commit 905adabdba
.
https://bugzilla.redhat.com/show_bug.cgi?id=2124443
https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/merge_requests/1401
This commit is contained in:
parent
683239166b
commit
9819738607
|
@ -6651,7 +6651,6 @@ device_link_changed(gpointer user_data)
|
|||
NMDeviceClass *klass = NM_DEVICE_GET_CLASS(self);
|
||||
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE(self);
|
||||
gboolean ip_ifname_changed = FALSE;
|
||||
gboolean hw_addr_changed;
|
||||
nm_auto_nmpobj const NMPObject *pllink_keep_alive = NULL;
|
||||
const NMPlatformLink *pllink;
|
||||
const char *str;
|
||||
|
@ -6698,9 +6697,9 @@ device_link_changed(gpointer user_data)
|
|||
if (ifindex == nm_device_get_ip_ifindex(self))
|
||||
_stats_update_counters_from_pllink(self, pllink);
|
||||
|
||||
had_hw_addr = (priv->hw_addr != NULL);
|
||||
hw_addr_changed = nm_device_update_hw_address(self);
|
||||
got_hw_addr = (!had_hw_addr && priv->hw_addr);
|
||||
had_hw_addr = (priv->hw_addr != NULL);
|
||||
nm_device_update_hw_address(self);
|
||||
got_hw_addr = (!had_hw_addr && priv->hw_addr);
|
||||
nm_device_update_permanent_hw_address(self, FALSE);
|
||||
|
||||
if (pllink->name[0] && !nm_streq(priv->iface, pllink->name)) {
|
||||
|
@ -6751,8 +6750,6 @@ device_link_changed(gpointer user_data)
|
|||
/* Update DHCP, etc, if needed */
|
||||
if (ip_ifname_changed)
|
||||
nm_device_update_dynamic_ip_setup(self, "IP interface changed");
|
||||
else if (hw_addr_changed)
|
||||
nm_device_update_dynamic_ip_setup(self, "hw-address changed");
|
||||
|
||||
was_up = priv->up;
|
||||
priv->up = NM_FLAGS_HAS(pllink->n_ifi_flags, IFF_UP);
|
||||
|
|
Loading…
Reference in a new issue