aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/rndis_wlan.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 /drivers/net/wireless/rndis_wlan.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 'drivers/net/wireless/rndis_wlan.c')
-rw-r--r--drivers/net/wireless/rndis_wlan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index abe1d039be81..fe2f272689aa 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2029,7 +2029,7 @@ static bool rndis_bss_info_update(struct usbnet *usbdev,
2029 bss = cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid->mac, 2029 bss = cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid->mac,
2030 timestamp, capability, beacon_interval, ie, ie_len, signal, 2030 timestamp, capability, beacon_interval, ie, ie_len, signal,
2031 GFP_KERNEL); 2031 GFP_KERNEL);
2032 cfg80211_put_bss(bss); 2032 cfg80211_put_bss(priv->wdev.wiphy, bss);
2033 2033
2034 return (bss != NULL); 2034 return (bss != NULL);
2035} 2035}
@@ -2718,7 +2718,7 @@ static void rndis_wlan_craft_connected_bss(struct usbnet *usbdev, u8 *bssid,
2718 bss = cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid, 2718 bss = cfg80211_inform_bss(priv->wdev.wiphy, channel, bssid,
2719 timestamp, capability, beacon_period, ie_buf, ie_len, 2719 timestamp, capability, beacon_period, ie_buf, ie_len,
2720 signal, GFP_KERNEL); 2720 signal, GFP_KERNEL);
2721 cfg80211_put_bss(bss); 2721 cfg80211_put_bss(priv->wdev.wiphy, bss);
2722} 2722}
2723 2723
2724/* 2724/*