summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Cardace <acardace@redhat.com>2021-01-20 19:25:51 +0100
committerAntonio Cardace <acardace@redhat.com>2021-01-22 14:44:20 +0100
commitae86af13494c463088e5fc44a0c5981880c6aded (patch)
tree63a3988285c47f488653183433765e12f1b7abae
parentbfd4209e1f7593757240654871cc70b78dce1cee (diff)
downloadNetworkManager-ae86af13494c463088e5fc44a0c5981880c6aded.tar.gz
device: add 'master_ifindex' field to NMDevice
https://bugzilla.redhat.com/show_bug.cgi?id=1870691 Signed-off-by: Antonio Cardace <acardace@redhat.com>
-rw-r--r--src/devices/nm-device.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 2f5f4eb009..5d11e30b91 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -642,6 +642,7 @@ typedef struct _NMDevicePrivate {
/* master interface for bridge/bond/team slave */
NMDevice *master;
gulong master_ready_id;
+ int master_ifindex;
/* slave management */
CList slaves; /* list of SlaveInfo */
@@ -5116,6 +5117,8 @@ device_recheck_slave_status(NMDevice *self, const NMPlatformLink *plink)
return;
}
+ priv->master_ifindex = plink->master;
+
if (priv->master) {
if (plink->master > 0 && plink->master == nm_device_get_ifindex(priv->master)) {
/* call add-slave again. We expect @self already to be added to
@@ -6210,6 +6213,8 @@ nm_device_unrealize(NMDevice *self, gboolean remove_resources, GError **error)
if (nm_clear_g_free(&priv->ip_iface_))
_notify(self, PROP_IP_IFACE);
+ priv->master_ifindex = 0;
+
_set_mtu(self, 0);
if (priv->driver_version) {