colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

team: remove variable teamd_on_dbus that was always FALSE

Browse Source 
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>
This commit is contained in:
Thomas Haller
2013-09-30 21:57:23 +02:00
parent d11f41a8a0
commit 0f88cb13f1
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/devices/nm-device-team.c
View File

@@ -60,7 +60,6 @@ typedef struct {
guint teamd_process_watch; guint teamd_process_watch;
guint teamd_timeout; guint teamd_timeout;
guint teamd_dbus_watch; guint teamd_dbus_watch;
gboolean teamd_on_dbus;
} NMDeviceTeamPrivate; } NMDeviceTeamPrivate;
enum { enum {
@@ -264,8 +263,6 @@ teamd_cleanup (NMDevice *dev)
#endif #endif
teamd_timeout_remove (dev); teamd_timeout_remove (dev);
priv->teamd_on_dbus = FALSE;
} }
static gboolean static gboolean
@@ -295,7 +292,6 @@ teamd_dbus_appeared (GDBusConnection *connection,
return; return;
nm_log_info (LOGD_TEAM, "(%s): teamd appeared on D-Bus", nm_device_get_iface (dev)); 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); teamd_timeout_remove (dev);
#if WITH_TEAMDCTL #if WITH_TEAMDCTL
if (!priv->tdc) { if (!priv->tdc) {
@@ -323,7 +319,7 @@ teamd_dbus_vanished (GDBusConnection *connection,
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev); NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (dev);
NMDeviceState state; NMDeviceState state;
if (!priv->teamd_dbus_watch || !priv->teamd_on_dbus) if (!priv->teamd_dbus_watch)
return; return;
nm_log_info (LOGD_TEAM, "(%s): teamd vanished from D-Bus", nm_device_get_iface (dev)); nm_log_info (LOGD_TEAM, "(%s): teamd vanished from D-Bus", nm_device_get_iface (dev));
teamd_cleanup (dev); teamd_cleanup (dev);