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

Commit 29ce6ecb authored by Avraham Stern's avatar Avraham Stern Committed by Johannes Berg
Browse files

cfg80211: unify cfg80211_roamed() and cfg80211_roamed_bss() 



cfg80211_roamed() and cfg80211_roamed_bss() take the same arguments
except that cfg80211_roamed() requires the BSSID and
cfg80211_roamed_bss() requires the bss entry.

Unify the two functions by using a struct for driver initiated
roaming information so that either the BSSID or the bss entry can be
passed as an argument to the unified function.

Signed-off-by: default avatarAvraham Stern <avraham.stern@intel.com>
[modified the ath6k, brcm80211, rndis and wlan-ng drivers accordingly]
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
[modify brcmfmac to remove the useless cast, spotted by Arend]
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 21a8e9dd

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

+8 −2
Original line number Diff line number Diff line
@@ -806,9 +806,15 @@ void ath6kl_cfg80211_connect_event(struct ath6kl_vif *vif, u16 channel, 
					WLAN_STATUS_SUCCESS, GFP_KERNEL);

		cfg80211_put_bss(ar->wiphy, bss);

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

		struct cfg80211_roam_info roam_info = {

			.bss = bss,

			.req_ie = assoc_req_ie,

			.req_ie_len = assoc_req_len,

			.resp_ie = assoc_resp_ie,

			.resp_ie_len = assoc_resp_len,

		};

		/* inform roam event to cfg80211 */

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

				    assoc_resp_ie, assoc_resp_len, GFP_KERNEL);

		cfg80211_roamed(vif->ndev, &roam_info, GFP_KERNEL);

	}

}

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+10 −3
Original line number Diff line number Diff line
@@ -5359,6 +5359,7 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_info *cfg, 
	struct ieee80211_supported_band *band;

	struct brcmf_bss_info_le *bi;

	struct brcmu_chan ch;

	struct cfg80211_roam_info roam_info = {};

	u32 freq;

	s32 err = 0;

	u8 *buf;
@@ -5397,9 +5398,15 @@ brcmf_bss_roaming_done(struct brcmf_cfg80211_info *cfg, 


done:

	kfree(buf);

	cfg80211_roamed(ndev, notify_channel, (u8 *)profile->bssid,

			conn_info->req_ie, conn_info->req_ie_len,

			conn_info->resp_ie, conn_info->resp_ie_len, GFP_KERNEL);



	roam_info.channel = notify_channel;

	roam_info.bssid = profile->bssid;

	roam_info.req_ie = conn_info->req_ie;

	roam_info.req_ie_len = conn_info->req_ie_len;

	roam_info.resp_ie = conn_info->resp_ie;

	roam_info.resp_ie_len = conn_info->resp_ie_len;



	cfg80211_roamed(ndev, &roam_info, GFP_KERNEL);

	brcmf_dbg(CONN, "Report roaming result\n");



	set_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state);

drivers/net/wireless/rndis_wlan.c

+13 −6
Original line number Diff line number Diff line
@@ -2830,15 +2830,22 @@ static void rndis_wlan_do_link_up_work(struct usbnet *usbdev) 
	}



	if (priv->infra_mode == NDIS_80211_INFRA_INFRA) {

		if (!roamed)

		if (!roamed) {

			cfg80211_connect_result(usbdev->net, bssid, req_ie,

						req_ie_len, resp_ie,

						resp_ie_len, 0, GFP_KERNEL);

		else

			cfg80211_roamed(usbdev->net,

					get_current_channel(usbdev, NULL),

					bssid, req_ie, req_ie_len,

					resp_ie, resp_ie_len, GFP_KERNEL);

		} else {

			struct cfg80211_roam_info roam_info = {

				.channel = get_current_channel(usbdev, NULL),

				.bssid = bssid,

				.req_ie = req_ie,

				.req_ie_len = req_ie_len,

				.resp_ie = resp_ie,

				.resp_ie_len = resp_ie_len,

			};



			cfg80211_roamed(usbdev->net, &roam_info, GFP_KERNEL);

		}

	} else if (priv->infra_mode == NDIS_80211_INFRA_ADHOC)

		cfg80211_ibss_joined(usbdev->net, bssid,

				     get_current_channel(usbdev, NULL),

drivers/staging/wlan-ng/cfg80211.c

+5 −2
Original line number Diff line number Diff line
@@ -666,8 +666,11 @@ void prism2_disconnected(struct wlandevice *wlandev) 


void prism2_roamed(struct wlandevice *wlandev)

{

	cfg80211_roamed(wlandev->netdev, NULL, wlandev->bssid,

			NULL, 0, NULL, 0, GFP_KERNEL);

	struct cfg80211_roam_info roam_info = {

		.bssid = wlandev->bssid,

	};



	cfg80211_roamed(wlandev->netdev, &roam_info, GFP_KERNEL);

}



/* Structures for declaring wiphy interface */

include/net/cfg80211.h

+26 −32
Original line number Diff line number Diff line
@@ -2686,8 +2686,7 @@ struct cfg80211_nan_func { 
 *	indication of requesting reassociation.

 *	In both the driver-initiated and new connect() call initiated roaming

 *	cases, the result of roaming is indicated with a call to

 *	cfg80211_roamed() or cfg80211_roamed_bss().

 *	(invoked with the wireless_dev mutex held)

 *	cfg80211_roamed(). (invoked with the wireless_dev mutex held)

 * @update_connect_params: Update the connect parameters while connected to a

 *	BSS. The updated parameters can be used by driver/firmware for

 *	subsequent BSS selection (roaming) decisions and to form the
@@ -5390,51 +5389,46 @@ cfg80211_connect_timeout(struct net_device *dev, const u8 *bssid, 
}



/**

 * cfg80211_roamed - notify cfg80211 of roaming

 * struct cfg80211_roam_info - driver initiated roaming information

 *

 * @dev: network device

 * @channel: the channel of the new AP

 * @bssid: the BSSID of the new AP

 * @bss: entry of bss to which STA got roamed (may be %NULL if %bssid is set)

 * @bssid: the BSSID of the new AP (may be %NULL if %bss is set)

 * @req_ie: association request IEs (maybe be %NULL)

 * @req_ie_len: association request IEs length

 * @resp_ie: association response IEs (may be %NULL)

 * @resp_ie_len: assoc response IEs length

 * @gfp: allocation flags

 *

 * It should be called by the underlying driver whenever it roamed

 * from one AP to another while connected.

 */

void cfg80211_roamed(struct net_device *dev,

		     struct ieee80211_channel *channel,

		     const u8 *bssid,

		     const u8 *req_ie, size_t req_ie_len,

		     const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp);

struct cfg80211_roam_info {

	struct ieee80211_channel *channel;

	struct cfg80211_bss *bss;

	const u8 *bssid;

	const u8 *req_ie;

	size_t req_ie_len;

	const u8 *resp_ie;

	size_t resp_ie_len;

};



/**

 * cfg80211_roamed_bss - notify cfg80211 of roaming

 * cfg80211_roamed - notify cfg80211 of roaming

 *

 * @dev: network device

 * @bss: entry of bss to which STA got roamed

 * @req_ie: association request IEs (maybe be %NULL)

 * @req_ie_len: association request IEs length

 * @resp_ie: association response IEs (may be %NULL)

 * @resp_ie_len: assoc response IEs length

 * @info: information about the new BSS. struct &cfg80211_roam_info.

 * @gfp: allocation flags

 *

 * This is just a wrapper to notify cfg80211 of roaming event with driver

 * passing bss to avoid a race in timeout of the bss entry. It should be

 * called by the underlying driver whenever it roamed from one AP to another

 * while connected. Drivers which have roaming implemented in firmware

 * may use this function to avoid a race in bss entry timeout where the bss

 * entry of the new AP is seen in the driver, but gets timed out by the time

 * it is accessed in __cfg80211_roamed() due to delay in scheduling

 * This function may be called with the driver passing either the BSSID of the

 * new AP or passing the bss entry to avoid a race in timeout of the bss entry.

 * It should be called by the underlying driver whenever it roamed from one AP

 * to another while connected. Drivers which have roaming implemented in

 * firmware should pass the bss entry to avoid a race in bss entry timeout where

 * the bss entry of the new AP is seen in the driver, but gets timed out by the

 * time it is accessed in __cfg80211_roamed() due to delay in scheduling

 * rdev->event_work. In case of any failures, the reference is released

 * either in cfg80211_roamed_bss() or in __cfg80211_romed(), Otherwise,

 * it will be released while diconneting from the current bss.

 * either in cfg80211_roamed() or in __cfg80211_romed(), Otherwise, it will be

 * released while diconneting from the current bss.

 */

void cfg80211_roamed_bss(struct net_device *dev, struct cfg80211_bss *bss,

			 const u8 *req_ie, size_t req_ie_len,

			 const u8 *resp_ie, size_t resp_ie_len, gfp_t gfp);

void cfg80211_roamed(struct net_device *dev, struct cfg80211_roam_info *info,

		     gfp_t gfp);



/**

 * cfg80211_disconnected - notify cfg80211 that connection was dropped