From f5f1cc93070bb91b3444191b20e13319135f0a9e Mon Sep 17 00:00:00 2001
From: Jouni Malinen <jouni@qca.qualcomm.com>
Date: Fri, 17 Jul 2015 16:59:09 +0300
Subject: [PATCH] FST: Clean up fst_group_update_ie()

None of the callers passed in cleaning_up == TRUE, so drop that unused
code path.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
---
 src/fst/fst.c       |  8 ++++----
 src/fst/fst_group.c | 21 +++++++--------------
 src/fst/fst_group.h |  2 +-
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/src/fst/fst.c b/src/fst/fst.c
index b70ef361a..a6d0de9ae 100644
--- a/src/fst/fst.c
+++ b/src/fst/fst.c
@@ -95,7 +95,7 @@ struct fst_iface * fst_attach(const char *ifname, const u8 *own_addr,
 	}
 
 	fst_group_attach_iface(group, iface);
-	fst_group_update_ie(group, FALSE);
+	fst_group_update_ie(group);
 
 	foreach_fst_ctrl_call(on_iface_added, iface);
 
@@ -117,7 +117,7 @@ void fst_detach(struct fst_iface *iface)
 	foreach_fst_ctrl_call(on_iface_removed, iface);
 	fst_group_detach_iface(group, iface);
 	fst_iface_delete(iface);
-	fst_group_update_ie(group, FALSE);
+	fst_group_update_ie(group);
 	fst_group_delete_if_empty(group);
 }
 
@@ -194,7 +194,7 @@ void fst_notify_peer_connected(struct fst_iface *iface, const u8 *addr)
 		return;
 
 #ifndef HOSTAPD
-	fst_group_update_ie(fst_iface_get_group(iface), FALSE);
+	fst_group_update_ie(fst_iface_get_group(iface));
 #endif /* HOSTAPD */
 
 	fst_printf_iface(iface, MSG_DEBUG, MACSTR " became connected",
@@ -210,7 +210,7 @@ void fst_notify_peer_disconnected(struct fst_iface *iface, const u8 *addr)
 		return;
 
 #ifndef HOSTAPD
-	fst_group_update_ie(fst_iface_get_group(iface), FALSE);
+	fst_group_update_ie(fst_iface_get_group(iface));
 #endif /* HOSTAPD */
 
 	fst_printf_iface(iface, MSG_DEBUG, MACSTR " became disconnected",
diff --git a/src/fst/fst_group.c b/src/fst/fst_group.c
index 3880f5e9c..e362aa2dc 100644
--- a/src/fst/fst_group.c
+++ b/src/fst/fst_group.c
@@ -444,25 +444,18 @@ Boolean fst_group_delete_if_empty(struct fst_group *group)
 }
 
 
-void fst_group_update_ie(struct fst_group *g, Boolean cleaning_up)
+void fst_group_update_ie(struct fst_group *g)
 {
 	struct fst_iface *i;
 
 	foreach_fst_group_iface(g, i) {
-		if (!cleaning_up) {
-			struct wpabuf *mbie = fst_group_create_mb_ie(g, i);
+		struct wpabuf *mbie = fst_group_create_mb_ie(g, i);
 
-			if (!mbie)
-				fst_printf_iface(i, MSG_WARNING,
-						 "cannot create MB IE");
+		if (!mbie)
+			fst_printf_iface(i, MSG_WARNING, "cannot create MB IE");
 
-			fst_iface_attach_mbie(i, mbie);
-			fst_iface_set_ies(i, mbie);
-			fst_printf_iface(i, MSG_DEBUG,
-					 "multi-band IE set to %p", mbie);
-		} else {
-			fst_iface_attach_mbie(i, NULL);
-			fst_iface_set_ies(i, NULL);
-		}
+		fst_iface_attach_mbie(i, mbie);
+		fst_iface_set_ies(i, mbie);
+		fst_printf_iface(i, MSG_DEBUG, "multi-band IE set to %p", mbie);
 	}
 }
diff --git a/src/fst/fst_group.h b/src/fst/fst_group.h
index 4f33599d4..9dcc66694 100644
--- a/src/fst/fst_group.h
+++ b/src/fst/fst_group.h
@@ -27,7 +27,7 @@ void fst_group_attach_iface(struct fst_group *g, struct fst_iface *i);
 void fst_group_detach_iface(struct fst_group *g, struct fst_iface *i);
 void fst_group_delete(struct fst_group *g);
 
-void fst_group_update_ie(struct fst_group *g, Boolean cleaning_up);
+void fst_group_update_ie(struct fst_group *g);
 
 static inline Boolean fst_group_has_ifaces(struct fst_group *g)
 {