aboutsummaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2013-01-31 19:49:58 -0500
committerJohannes Berg <johannes.berg@intel.com>2013-02-11 12:44:52 -0500
commit5b112d3d098c97b867cc580f590395cd1e72f18c (patch)
tree75e3a6434adaab876ae54ea35d7ceebebbf3ca4a /net/mac80211/mlme.c
parentbba87ffe606b7fc5fba73d1c0c5ac1eacd2cebe8 (diff)
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>
Diffstat (limited to 'net/mac80211/mlme.c')
-rw-r--r--net/mac80211/mlme.c6
1 files changed, 3 insertions, 3 deletions
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,
1934 ieee80211_vif_release_channel(sdata); 1934 ieee80211_vif_release_channel(sdata);
1935 } 1935 }
1936 1936
1937 cfg80211_put_bss(auth_data->bss); 1937 cfg80211_put_bss(sdata->local->hw.wiphy, auth_data->bss);
1938 kfree(auth_data); 1938 kfree(auth_data);
1939 sdata->u.mgd.auth_data = NULL; 1939 sdata->u.mgd.auth_data = NULL;
1940} 1940}
@@ -2387,7 +2387,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata,
2387 if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) { 2387 if (!ieee80211_assoc_success(sdata, *bss, mgmt, len)) {
2388 /* oops -- internal error -- send timeout for now */ 2388 /* oops -- internal error -- send timeout for now */
2389 ieee80211_destroy_assoc_data(sdata, false); 2389 ieee80211_destroy_assoc_data(sdata, false);
2390 cfg80211_put_bss(*bss); 2390 cfg80211_put_bss(sdata->local->hw.wiphy, *bss);
2391 return RX_MGMT_CFG80211_ASSOC_TIMEOUT; 2391 return RX_MGMT_CFG80211_ASSOC_TIMEOUT;
2392 } 2392 }
2393 sdata_info(sdata, "associated\n"); 2393 sdata_info(sdata, "associated\n");
@@ -3831,7 +3831,7 @@ int ieee80211_mgd_auth(struct ieee80211_sub_if_data *sdata,
3831 } 3831 }
3832 3832
3833 /* hold our own reference */ 3833 /* hold our own reference */
3834 cfg80211_ref_bss(auth_data->bss); 3834 cfg80211_ref_bss(local->hw.wiphy, auth_data->bss);
3835 err = 0; 3835 err = 0;
3836 goto out_unlock; 3836 goto out_unlock;
3837 3837