diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 19:16:12 (GMT) |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 19:16:12 (GMT) |
| commit | e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38 (patch) | |
| tree | d77b0c7f1f8890fb75098c550277fe9b81c340b3 /net/wireless/ibss.c | |
| parent | 36eed56a8f7e1bd7fb5014ea0e702708e1702f30 (diff) | |
| parent | 9e97d14b4923da524d202f2e005d5d30b70db9d6 (diff) | |
| download | linux-fsl-qoriq-e9b89fcc1f42fa6d19ecaae8cd8d86e49fa4cd38.tar.xz | |
Merge remote-tracking branch 'wireless-next/master' into iwlwifi-next
Diffstat (limited to 'net/wireless/ibss.c')
| -rw-r--r-- | net/wireless/ibss.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/ibss.c b/net/wireless/ibss.c index 9b9551e..d80e471 100644 --- a/net/wireless/ibss.c +++ b/net/wireless/ibss.c @@ -37,7 +37,7 @@ void __cfg80211_ibss_joined(struct net_device *dev, const u8 *bssid) if (wdev->current_bss) { cfg80211_unhold_bss(wdev->current_bss); - cfg80211_put_bss(&wdev->current_bss->pub); + cfg80211_put_bss(wdev->wiphy, &wdev->current_bss->pub); } cfg80211_hold_bss(bss_from_pub(bss)); @@ -182,7 +182,7 @@ static void __cfg80211_clear_ibss(struct net_device *dev, bool nowext) if (wdev->current_bss) { cfg80211_unhold_bss(wdev->current_bss); - cfg80211_put_bss(&wdev->current_bss->pub); + cfg80211_put_bss(wdev->wiphy, &wdev->current_bss->pub); } wdev->current_bss = NULL; |