mac80211: proper bss private data handling
Johannes Berg
maintainerPATCH 1/1 mac80211: proper bss private data handling
cfg80211 offers private data for each BSS struct, which mac80211 uses. However, mac80211 uses internal and external (cfg80211) BSS pointers interchangeably and has a hack to put the cfg80211 bss struct into the private struct.
Remove this hack, properly converting between the pointers wherever necessary.
Signed-off-by Johannes Berg <[email protected]>
--- net/mac80211/cfg.c | 2 - net/mac80211/ibss.c | 45 +++++++++++++++++------------- net/mac80211/ieee80211_i.h | 7 +--- net/mac80211/main.c | 4 -- net/mac80211/mlme.c | 66 +++++++++++++++++++++++---------------------- net/mac80211/scan.c | 29 ++++++++++++------- net/mac80211/work.c | 3 -- 7 files changed, 83 insertions(+), 73 deletions(-)
net/mac80211/ieee80211_i.h +2 -5
@@ -71,9 +71,6 @@ struct ieee80211_fragment_entry {struct ieee80211_bss { -/* Yes, this is a hack */ -struct cfg80211_bss cbss; -/* don't want to look up all the time */ size_t ssid_len;u8 ssid[IEEE80211_MAX_SSID_LEN ];
@@ -274,7 +271,7 @@ struct ieee80211_work {bool privacy; } probe_auth;struct { -struct ieee80211_bss *bss; +struct cfg80211_bss *bss;const u8 *supp_rates;const u8 *ht_information_ie;enum ieee80211_smps_mode smps;
@@ -317,7 +314,7 @@ struct ieee80211_if_managed {int probe_send_count;struct mutex mtx; -struct ieee80211_bss *associated; +struct cfg80211_bss *associated;u8 bssid[ETH_ALEN ];
net/mac80211/cfg.c +1 -1
@@ -1342,7 +1342,7 @@ int __ieee80211_request_smps(struct ieeereturn 0 ; } - ap = sdata->u.mgd.associated->cbss.bssid; + ap = sdata->u.mgd.associated->bssid;if (smps_mode ==IEEE80211_SMPS_AUTOMATIC ) {if (sdata->u.mgd.powersave)
net/mac80211/ibss.c +26 -19
113 lines not on this page · raw message
net/mac80211/mlme.c +34 -32
214 lines not on this page · raw message
net/mac80211/scan.c +18 -11
@@ -29,16 +29,19 @@ struct ieee80211_bss * ieee80211_rx_bss_get(struct ieee80211_local *local, u8 *bssid, int freq, u8 *ssid, u8 ssid_len) { - return (void *)cfg80211_get_bss(local->hw.wiphy, - ieee80211_get_channel(local->hw.wiphy, - freq), - bssid, ssid, ssid_len, - 0, 0); + struct cfg80211_bss *cbss; + + cbss =cfg80211_get_bss (local->hw.wiphy, +ieee80211_get_channel (local->hw.wiphy, freq), + bssid, ssid, ssid_len,0 ,0 ); +if (!cbss) +return NULL ; +return (void *)cbss->priv; }static void ieee80211_rx_bss_free (struct cfg80211_bss *cbss) { -struct ieee80211_bss *bss = (void *)cbss; +struct ieee80211_bss *bss = (void *)cbss->priv;kfree (bss_mesh_id (bss));kfree (bss_mesh_cfg (bss));
@@ -47,7 +50,9 @@ static void ieee80211_rx_bss_free(structvoid ieee80211_rx_bss_put (struct ieee80211_local *local,struct ieee80211_bss *bss) { -cfg80211_put_bss ((struct cfg80211_bss *)bss); +if (!bss) +return ; + cfg80211_put_bss(container_of((void *)bss, struct cfg80211_bss, priv)); } struct ieee80211_bss *
@@ -59,6 +64,7 @@ ieee80211_bss_info_update(struct ieee802 struct ieee80211_channel *channel, bool beacon) { +struct cfg80211_bss *cbss;struct ieee80211_bss *bss;int clen;s32 signal =0 ;
@@ -68,13 +74,14 @@ ieee80211_bss_info_update(struct ieee802else if (local->hw.flags &IEEE80211_HW_SIGNAL_UNSPEC ) signal = (rx_status->signal *100 ) / local->hw.max_signal; - bss = (void *)cfg80211_inform_bss_frame (local->hw.wiphy, channel, - mgmt, len, signal,GFP_ATOMIC ); + cbss =cfg80211_inform_bss_frame (local->hw.wiphy, channel, + mgmt, len, signal,GFP_ATOMIC ); -if (!bss) +if (!cbss)return NULL ; - bss->cbss.free_priv = ieee80211_rx_bss_free; + cbss->free_priv = ieee80211_rx_bss_free; + bss = (void *)cbss->priv;/* save the ERP value so that it is available at association time */ if (elems->erp_info && elems->erp_info_len >=1 ) {
net/mac80211/work.c +1 -2
@@ -517,8 +517,7 @@ ieee80211_associate(struct ieee80211_wor* bss struct for that AP. */ if (wk->assoc.bss) -cfg80211_unlink_bss (local->hw.wiphy, - &wk->assoc.bss->cbss); +cfg80211_unlink_bss (local->hw.wiphy, wk->assoc.bss);/* * We might have a pending scan which had no chance to run yet
net/mac80211/main.c +1 -3
@@ -359,9 +359,7 @@ struct ieee80211_hw *ieee80211_alloc_hw(WIPHY_FLAG_4ADDR_STATION ; wiphy->privid = mac80211_wiphy_privid; -/* Yes, putting cfg80211_bss into ieee80211_bss is a hack */ - wiphy->bss_priv_size =sizeof (struct ieee80211_bss ) - -sizeof (struct cfg80211_bss ); + wiphy->bss_priv_size =sizeof (struct ieee80211_bss ); local =wiphy_priv (wiphy);