Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fe0c75e authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

parents 8457703f 9c35d7d2

drivers/net/wireless/ath/ath6kl/cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
		ath6kl_dbg(ATH6KL_DBG_WLAN_CFG, "ad-hoc %s selected\n",

			   nw_type & ADHOC_CREATOR ? "creator" : "joiner");

		cfg80211_ibss_joined(vif->ndev, bssid, GFP_KERNEL);

		cfg80211_put_bss(bss);

		cfg80211_put_bss(ar->wiphy, bss);

		return;

	}
@@ -778,7 +778,7 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
					assoc_req_ie, assoc_req_len,

					assoc_resp_ie, assoc_resp_len,

					WLAN_STATUS_SUCCESS, GFP_KERNEL);

		cfg80211_put_bss(bss);

		cfg80211_put_bss(ar->wiphy, bss);

	} else if (vif->sme_state == SME_CONNECTED) {

		/* inform roam event to cfg80211 */

		cfg80211_roamed_bss(vif->ndev, bss, assoc_req_ie, assoc_req_len,

drivers/net/wireless/ath/ath6kl/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -1108,7 +1108,7 @@ static int ath6kl_wmi_bssinfo_event_rx(struct wmi *wmi, u8 *datap, int len, 
	kfree(mgmt);

	if (bss == NULL)

		return -ENOMEM;

	cfg80211_put_bss(bss);

	cfg80211_put_bss(ar->wiphy, bss);



	/*

	 * Firmware doesn't return any event when scheduled scan has

drivers/net/wireless/ath/wil6210/cfg80211.c

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ static int wil_cfg80211_connect(struct wiphy *wiphy, 
	}



 out:

	cfg80211_put_bss(bss);

	cfg80211_put_bss(wiphy, bss);



	return rc;

}

drivers/net/wireless/ath/wil6210/wmi.c

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ static void wmi_evt_rx_mgmt(struct wil6210_priv *wil, int id, void *d, int len) 
		if (bss) {

			wil_dbg_wmi(wil, "Added BSS %pM\n",

				    rx_mgmt_frame->bssid);

			cfg80211_put_bss(bss);

			cfg80211_put_bss(wiphy, bss);

		} else {

			wil_err(wil, "cfg80211_inform_bss() failed\n");

		}

drivers/net/wireless/brcm80211/brcmfmac/wl_cfg80211.c

+2 −2
Original line number Diff line number Diff line
@@ -2323,7 +2323,7 @@ static s32 brcmf_inform_single_bss(struct brcmf_cfg80211_info *cfg, 
	if (!bss)

		return -ENOMEM;



	cfg80211_put_bss(bss);

	cfg80211_put_bss(wiphy, bss);



	return err;

}
@@ -2429,7 +2429,7 @@ static s32 wl_inform_ibss(struct brcmf_cfg80211_info *cfg, 
		goto CleanUp;

	}



	cfg80211_put_bss(bss);

	cfg80211_put_bss(wiphy, bss);



CleanUp: