From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Fri, 17 Apr 2009 13:06:12 +0000 (+0300)
Subject: nl80211: Delete Beacon information on deinit in wpa_supplicant AP mode
X-Git-Url: http://git.maemo.org/git/?p=wpasupplicant;a=commitdiff_plain;h=8a27af5c70387a2aef710204df219af662cb35e9

nl80211: Delete Beacon information on deinit in wpa_supplicant AP mode
---

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index 08c1fdc..9413575 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -143,7 +143,6 @@ static struct i802_bss * get_bss(struct wpa_driver_nl80211_data *drv,
 static void nl80211_remove_iface(struct wpa_driver_nl80211_data *drv,
 				 int ifidx);
 static int i802_set_freq(void *priv, struct hostapd_freq_params *freq);
-static int i802_del_beacon(struct wpa_driver_nl80211_data *drv);
 #endif /* HOSTAPD */
 
 
@@ -1263,6 +1262,26 @@ static void wpa_driver_nl80211_free_bss(struct wpa_driver_nl80211_data *drv)
 #endif /* HOSTAPD */
 
 
+#if defined(CONFIG_AP) || defined(HOSTAPD)
+static int wpa_driver_nl80211_del_beacon(struct wpa_driver_nl80211_data *drv)
+{
+	struct nl_msg *msg;
+
+	msg = nlmsg_alloc();
+	if (!msg)
+		return -ENOMEM;
+
+	genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
+		    0, NL80211_CMD_DEL_BEACON, 0);
+	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, drv->ifindex);
+
+	return send_and_recv_msgs(drv, msg, NULL, NULL);
+ nla_put_failure:
+	return -ENOBUFS;
+}
+#endif /* CONFIG_AP || HOSTAPD */
+
+
 /**
  * wpa_driver_nl80211_deinit - Deinitialize nl80211 driver interface
  * @priv: Pointer to private nl80211 data from wpa_driver_nl80211_init()
@@ -1281,6 +1300,9 @@ static void wpa_driver_nl80211_deinit(void *priv)
 		eloop_unregister_read_sock(drv->monitor_sock);
 		close(drv->monitor_sock);
 	}
+
+	if (drv->nlmode == NL80211_IFTYPE_AP)
+		wpa_driver_nl80211_del_beacon(drv);
 #endif /* CONFIG_AP || HOSTAPD */
 
 #ifdef HOSTAPD
@@ -1292,8 +1314,6 @@ static void wpa_driver_nl80211_deinit(void *priv)
 		i802_set_freq(priv, &freq);
 	}
 
-	i802_del_beacon(drv);
-
 	if (drv->eapol_sock >= 0) {
 		eloop_unregister_read_sock(drv->eapol_sock);
 		close(drv->eapol_sock);
@@ -3621,24 +3641,6 @@ static int i802_set_beacon(const char *iface, void *priv,
 }
 
 
-static int i802_del_beacon(struct wpa_driver_nl80211_data *drv)
-{
-	struct nl_msg *msg;
-
-	msg = nlmsg_alloc();
-	if (!msg)
-		return -ENOMEM;
-
-	genlmsg_put(msg, 0, 0, genl_family_get_id(drv->nl80211), 0,
-		    0, NL80211_CMD_DEL_BEACON, 0);
-	NLA_PUT_U32(msg, NL80211_ATTR_IFINDEX, if_nametoindex(drv->ifname));
-
-	return send_and_recv_msgs(drv, msg, NULL, NULL);
- nla_put_failure:
-	return -ENOBUFS;
-}
-
-
 static int i802_set_bss(void *priv, int cts, int preamble, int slot)
 {
 	struct wpa_driver_nl80211_data *drv = priv;