diff options
-rw-r--r-- | include/net/cfg80211.h | 3 | ||||
-rw-r--r-- | net/wireless/scan.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/include/net/cfg80211.h b/include/net/cfg80211.h index 48add7e3ba1d..63599ab6005b 100644 --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h | |||
@@ -1289,7 +1289,6 @@ struct cfg80211_bss_ies { | |||
1289 | * @beacon_ies: the information elements from the last Beacon frame | 1289 | * @beacon_ies: the information elements from the last Beacon frame |
1290 | * @proberesp_ies: the information elements from the last Probe Response frame | 1290 | * @proberesp_ies: the information elements from the last Probe Response frame |
1291 | * @signal: signal strength value (type depends on the wiphy's signal_type) | 1291 | * @signal: signal strength value (type depends on the wiphy's signal_type) |
1292 | * @free_priv: function pointer to free private data | ||
1293 | * @priv: private area for driver use, has at least wiphy->bss_priv_size bytes | 1292 | * @priv: private area for driver use, has at least wiphy->bss_priv_size bytes |
1294 | */ | 1293 | */ |
1295 | struct cfg80211_bss { | 1294 | struct cfg80211_bss { |
@@ -1301,8 +1300,6 @@ struct cfg80211_bss { | |||
1301 | const struct cfg80211_bss_ies __rcu *beacon_ies; | 1300 | const struct cfg80211_bss_ies __rcu *beacon_ies; |
1302 | const struct cfg80211_bss_ies __rcu *proberesp_ies; | 1301 | const struct cfg80211_bss_ies __rcu *proberesp_ies; |
1303 | 1302 | ||
1304 | void (*free_priv)(struct cfg80211_bss *bss); | ||
1305 | |||
1306 | s32 signal; | 1303 | s32 signal; |
1307 | 1304 | ||
1308 | u16 beacon_interval; | 1305 | u16 beacon_interval; |
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index 01592d7d4789..ca367c58a3e2 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c | |||
@@ -31,9 +31,6 @@ static void bss_release(struct kref *ref) | |||
31 | if (WARN_ON(atomic_read(&bss->hold))) | 31 | if (WARN_ON(atomic_read(&bss->hold))) |
32 | return; | 32 | return; |
33 | 33 | ||
34 | if (bss->pub.free_priv) | ||
35 | bss->pub.free_priv(&bss->pub); | ||
36 | |||
37 | ies = (void *)rcu_access_pointer(bss->pub.beacon_ies); | 34 | ies = (void *)rcu_access_pointer(bss->pub.beacon_ies); |
38 | if (ies) | 35 | if (ies) |
39 | kfree_rcu(ies, rcu_head); | 36 | kfree_rcu(ies, rcu_head); |