2013-01-29 21:41:16

by Johannes Berg

Subject: [PATCH] cfg80211: remove free_priv BSS API

From: Johannes Berg <[email protected]>

Now that mac80211 no longer uses this API, remove
it completely. If anyone needs it again, we can
revert this patch of course, but mac80211 was the
only user right now.

Signed-off-by: Johannes Berg <[email protected]>
---
include/net/cfg80211.h | 3 ---
net/wireless/scan.c | 3 ---
2 files changed, 6 deletions(-)

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 4d28631..5eb20bc 100644
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1301,7 +1301,6 @@ struct cfg80211_bss_ies {
* @beacon_ies: the information elements from the last Beacon frame
* @proberesp_ies: the information elements from the last Probe Response frame
* @signal: signal strength value (type depends on the wiphy's 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 {
@@ -1313,8 +1312,6 @@ struct cfg80211_bss {
const struct cfg80211_bss_ies __rcu *beacon_ies;
const struct cfg80211_bss_ies __rcu *proberesp_ies;

- void (*free_priv)(struct cfg80211_bss *bss);
-
s32 signal;

u16 beacon_interval;
diff --git a/net/wireless/scan.c b/net/wireless/scan.c
index 01592d7..ca367c5 100644
--- a/net/wireless/scan.c
+++ b/net/wireless/scan.c
@@ -31,9 +31,6 @@ static void bss_release(struct kref *ref)
if (WARN_ON(atomic_read(&bss->hold)))
return;

- if (bss->pub.free_priv)
- bss->pub.free_priv(&bss->pub);
-
ies = (void *)rcu_access_pointer(bss->pub.beacon_ies);
if (ies)
kfree_rcu(ies, rcu_head);
--
1.8.0

2013-01-31 13:07:02

by Johannes Berg

Subject: Re: [PATCH] cfg80211: remove free_priv BSS API

On Tue, 2013-01-29 at 22:41 +0100, Johannes Berg wrote:
> From: Johannes Berg <[email protected]>
>
> Now that mac80211 no longer uses this API, remove
> it completely. If anyone needs it again, we can
> revert this patch of course, but mac80211 was the
> only user right now.

Applied.

johannes