From 1bc3df0bd4459cd6ec920d35322ce0db41721537 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 6 Jul 2016 17:11:53 +0200
Subject: [PATCH] rdisc: move @iid field to NMRDiscPrivate

---
 src/rdisc/nm-rdisc.c | 11 ++++++-----
 src/rdisc/nm-rdisc.h |  1 -
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/rdisc/nm-rdisc.c b/src/rdisc/nm-rdisc.c
index 5e84568d0f..437e24fa33 100644
--- a/src/rdisc/nm-rdisc.c
+++ b/src/rdisc/nm-rdisc.c
@@ -44,6 +44,7 @@ struct _NMRDiscPrivate {
 	guint ra_timeout_id;  /* first RA timeout */
 	guint timeout_id;   /* prefix/dns/etc lifetime timeout */
 	char *last_send_rs_error;
+	NMUtilsIPv6IfaceId iid;
 
 	int ifindex;
 	char *ifname;
@@ -222,14 +223,14 @@ complete_address (NMRDisc *rdisc, NMRDiscAddress *addr)
 		return TRUE;
 	}
 
-	if (!rdisc->iid.id) {
+	if (!priv->iid.id) {
 		_LOGW ("complete-address: can't generate an EUI-64 address: no interface identifier");
 		return FALSE;
 	}
 
 	if (addr->address.s6_addr32[2] == 0x0 && addr->address.s6_addr32[3] == 0x0) {
 		_LOGD ("complete-address: adding an EUI-64 address");
-		nm_utils_ipv6_addr_set_interface_identifier (&addr->address, rdisc->iid);
+		nm_utils_ipv6_addr_set_interface_identifier (&addr->address, priv->iid);
 		return TRUE;
 	}
 
@@ -401,10 +402,10 @@ nm_rdisc_set_iid (NMRDisc *rdisc, const NMUtilsIPv6IfaceId iid)
 
 	g_return_val_if_fail (NM_IS_RDISC (rdisc), FALSE);
 
-	if (rdisc->iid.id != iid.id) {
-		rdisc->iid = iid;
+	priv = NM_RDISC_GET_PRIVATE (rdisc);
+	if (priv->iid.id != iid.id) {
+		priv->iid = iid;
 
-		priv = NM_RDISC_GET_PRIVATE (rdisc);
 		if (priv->addr_gen_mode == NM_SETTING_IP6_CONFIG_ADDR_GEN_MODE_STABLE_PRIVACY)
 			return FALSE;
 
diff --git a/src/rdisc/nm-rdisc.h b/src/rdisc/nm-rdisc.h
index 2ce6c0e16a..0d6c5785e9 100644
--- a/src/rdisc/nm-rdisc.h
+++ b/src/rdisc/nm-rdisc.h
@@ -121,7 +121,6 @@ typedef struct {
 
 	struct _NMRDiscPrivate *_priv;
 
-	NMUtilsIPv6IfaceId iid;
 	gint32 max_addresses;
 	gint32 rtr_solicitations;
 	gint32 rtr_solicitation_interval;