diff options
| author | Thomas Haller <thaller@redhat.com> | 2013-09-30 21:57:23 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2013-10-01 11:45:46 +0200 |
| commit | 0f88cb13f17d814823dcde922c0ec7a3cc2c8945 (patch) | |
| tree | e7d6a6c3d7a19ea02087cb5b4bc71313e0b6bcfd | |
| parent | d11f41a8a09cf7f81c49d962ce2187b426c98a4b (diff) | |
| download | NetworkManager-0f88cb13f17d814823dcde922c0ec7a3cc2c8945.tar.gz | |
team: remove variable teamd_on_dbus that was always FALSE
The variable teamd_on_dbus in nm-device-team was never set to TRUE.
Remove it. Also, before teamd_dbus_vanished did never cleanup anything.
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | src/devices/nm-device-team.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/devices/nm-device-team.c b/src/devices/nm-device-team.c index e93dfcfa67..e800446708 100644 --- a/src/devices/nm-device-team.c +++ b/src/devices/nm-device-team.c @@ -60,7 +60,6 @@ typedef struct { guint teamd_process_watch; guint teamd_timeout; guint teamd_dbus_watch; - gboolean teamd_on_dbus; } NMDeviceTeamPrivate; enum { @@ -264,8 +263,6 @@ teamd_cleanup (NMDevice *dev) #endif teamd_timeout_remove (dev); - - priv->teamd_on_dbus = FALSE; } static gboolean @@ -295,7 +292,6 @@ teamd_dbus_appeared (GDBusConnection *connection, return; nm_log_info (LOGD_TEAM, "(%s): teamd appeared on D-Bus", nm_device_get_iface (dev)); - priv->teamd_on_dbus = FALSE; teamd_timeout_remove (dev); #if WITH_TEAMDCTL if (!priv->tdc) { @@ -323,7 +319,7 @@ teamd_dbus_vanished (GDBusConnection *connection, NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev); NMDeviceState state; - if (!priv->teamd_dbus_watch || !priv->teamd_on_dbus) + if (!priv->teamd_dbus_watch) return; nm_log_info (LOGD_TEAM, "(%s): teamd vanished from D-Bus", nm_device_get_iface (dev)); teamd_cleanup (dev); |