cfg80211: remove free_priv BSS API

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 <johannes.berg@intel.com>

diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h
index 48add7e3ba1d7747ffc7d8e386ebfec520d55652..63599ab6005bae6e0e76adb318681249a47c7441 100644 (file)
--- a/include/net/cfg80211.h
+++ b/include/net/cfg80211.h
@@ -1289,7 +1289,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 {
@@ -1301,8 +1300,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 01592d7d4789e389fd565e7cf9fb194dc7ee7bb0..ca367c58a3e2ad06a156d0922a4b53ba92f57dff 100644 (file)
--- 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);