cfg80211: pass wiphy to cfg80211_ref_bss/put_bss

This prepares for using the spinlock instead of krefs
which is needed in the next patch to track the refs
of combined BSSes correctly.

Acked-by: Bing Zhao <bzhao@marvell.com> [mwifiex]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

3 files changed, 7 insertions, 6 deletions

diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
index a54c8248e0e0..71c55cc0f7b6 100644
--- a/net/mac80211/ibss.c
+++ b/net/mac80211/ibss.c
@@ -228,7 +228,7 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata,
 
         bss = cfg80211_inform_bss_frame(local->hw.wiphy, chan,
                                         mgmt, skb->len, 0, GFP_KERNEL);
-        cfg80211_put_bss(bss);
+        cfg80211_put_bss(local->hw.wiphy, bss);
         netif_carrier_on(sdata->dev);
         cfg80211_ibss_joined(sdata->dev, ifibss->bssid, GFP_KERNEL);
 }
@@ -1159,7 +1159,7 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
 
                 if (cbss) {
                         cfg80211_unlink_bss(local->hw.wiphy, cbss);
-                        cfg80211_put_bss(cbss);
+                        cfg80211_put_bss(local->hw.wiphy, cbss);
                 }
         }
 
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 353b690900e9..15f2edd08a95 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1934,7 +1934,7 @@ static void ieee80211_destroy_auth_data(struct ieee80211_sub_if_data *sdata,
                 ieee80211_vif_release_channel(sdata);
         }
 
-        cfg80211_put_bss(auth_data->bss);
+        cfg80211_put_bss(sdata->local->hw.wiphy, auth_data->bss);
         kfree(auth_data);
         sdata->u.mgd.auth_data = NULL;
 }
@@ -2387,7 +2387,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
                 if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
                         /* oops -- internal error -- send timeout for now */
                         ieee80211_destroy_assoc_data(sdata, false);
-                        cfg80211_put_bss(*bss);
+                        cfg80211_put_bss(sdata->local->hw.wiphy, *bss);
                         return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
                 }
                 sdata_info(sdata, "associated\n");
@@ -3831,7 +3831,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
         }
 
         /* hold our own reference */
-        cfg80211_ref_bss(auth_data->bss);
+        cfg80211_ref_bss(local->hw.wiphy, auth_data->bss);
         err = 0;
         goto out_unlock;
 
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c
index 7f80f0a5026e..400153f7f21f 100644
--- a/net/mac80211/scan.c
+++ b/net/mac80211/scan.c
@@ -34,7 +34,8 @@ void ieee80211_rx_bss_put(struct ieee80211_local *local,
 {
         if (!bss)
                 return;
-        cfg80211_put_bss(container_of((void *)bss, struct cfg80211_bss, priv));
+        cfg80211_put_bss(local->hw.wiphy,
+                         container_of((void *)bss, struct cfg80211_bss, priv));
 }
 
 static bool is_uapsd_supported(struct ieee802_11_elems *elems)