From baa8b4029c46532293377126ce3dfa3ec0990716 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 4 May 2017 15:04:10 +0200
Subject: [PATCH] device: fix changing firewall zone during _set_state_full()

For regular devices that don't have a separate ip_iface/ip_ifindex,
the ip_ifindex is left at zero. Hence, the condition is always
true and does not work as intended, resulting in setting the
firewall zone twice.

Fixes: 7cf5c326bc9a3e3166c682f3d70f65b895f2cd20
---
 src/devices/nm-device.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index f30c472c7b..2f223d2104 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -12663,7 +12663,7 @@ _set_state_full (NMDevice *self,
 		applied_connection = nm_device_get_applied_connection (self);
 
 		if (   applied_connection
-		    && priv->ifindex != priv->ip_ifindex
+		    && priv->ip_iface
 		    && !nm_device_sys_iface_state_is_external (self)) {
 			NMSettingConnection *s_con;
 			const char *zone;