From 0bb0d2a90978a0a098f458885b55212da06b04e4 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes@sipsolutions.net>
Date: Tue, 10 Feb 2009 21:25:57 +0100
Subject: [PATCH] --- yaml --- r: 134498 b: refs/heads/master c:
 78c1c7e109f1f14e7c18f290c4ebc58da220c7ba h: refs/heads/master v: v3

---
 [refs]                       | 2 +-
 trunk/include/net/cfg80211.h | 2 ++
 trunk/net/wireless/core.c    | 2 +-
 trunk/net/wireless/scan.c    | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ff2075bb12e6..1de214092307 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99cf5f5f3571ce3a837e379d3b87bf5ddf54f17d
+refs/heads/master: 78c1c7e109f1f14e7c18f290c4ebc58da220c7ba
diff --git a/trunk/include/net/cfg80211.h b/trunk/include/net/cfg80211.h
index 09a0b268e5cf..b514abcc2b93 100644
--- a/trunk/include/net/cfg80211.h
+++ b/trunk/include/net/cfg80211.h
@@ -567,6 +567,7 @@ enum cfg80211_signal_type {
  * @len_information_elements: total length of the information elements
  * @signal: signal strength value
  * @signal_type: signal type
+ * @free_priv: function pointer to free private data
  * @priv: private area for driver use, has at least wiphy->bss_priv_size bytes
  */
 struct cfg80211_bss {
@@ -582,6 +583,7 @@ struct cfg80211_bss {
 	s32 signal;
 	enum cfg80211_signal_type signal_type;
 
+	void (*free_priv)(struct cfg80211_bss *bss);
 	u8 priv[0] __attribute__((__aligned__(sizeof(void *))));
 };
 
diff --git a/trunk/net/wireless/core.c b/trunk/net/wireless/core.c
index 3cccd1390cea..0668b2bfc1da 100644
--- a/trunk/net/wireless/core.c
+++ b/trunk/net/wireless/core.c
@@ -376,7 +376,7 @@ void cfg80211_dev_free(struct cfg80211_registered_device *drv)
 	mutex_destroy(&drv->mtx);
 	mutex_destroy(&drv->devlist_mtx);
 	list_for_each_entry_safe(scan, tmp, &drv->bss_list, list)
-		kfree(scan);
+		cfg80211_put_bss(&scan->pub);
 	kfree(drv);
 }
 
diff --git a/trunk/net/wireless/scan.c b/trunk/net/wireless/scan.c
index 009d12810c55..ec148f68a62b 100644
--- a/trunk/net/wireless/scan.c
+++ b/trunk/net/wireless/scan.c
@@ -56,6 +56,8 @@ static void bss_release(struct kref *ref)
 	struct cfg80211_internal_bss *bss;
 
 	bss = container_of(ref, struct cfg80211_internal_bss, ref);
+	if (bss->pub.free_priv)
+		bss->pub.free_priv(&bss->pub);
 	kfree(bss);
 }