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

Commit a77029ee authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlwifi: introduce post_scan hook 



The different drivers need to do different things
after a scan, so create a post_scan hook to allow
them to do this.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 7314c2b3

drivers/net/wireless/iwlwifi/iwl-3945.c

+1 −0
Original line number Diff line number Diff line
@@ -2713,6 +2713,7 @@ static struct iwl_hcmd_utils_ops iwl3945_hcmd_utils = { 
	.build_addsta_hcmd = iwl3945_build_addsta_hcmd,

	.tx_cmd_protection = iwlcore_tx_cmd_protection,

	.request_scan = iwl3945_request_scan,

	.post_scan = iwl3945_post_scan,

};



static const struct iwl_ops iwl3945_ops = {

drivers/net/wireless/iwlwifi/iwl-3945.h

+1 −0
Original line number Diff line number Diff line
@@ -296,6 +296,7 @@ extern int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate); 


/* scanning */

int iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif);

void iwl3945_post_scan(struct iwl_priv *priv);



/* Requires full declaration of iwl_priv before including */

#include "iwl-io.h"

drivers/net/wireless/iwlwifi/iwl-4965.c

+13 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,18 @@ static struct iwl_hcmd_ops iwl4965_hcmd = { 
	.send_bt_config = iwl_send_bt_config,

};



static void iwl4965_post_scan(struct iwl_priv *priv)

{

	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];



	/*

	 * Since setting the RXON may have been deferred while

	 * performing the scan, fire one off if needed

	 */

	if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))

		iwlcore_commit_rxon(priv, ctx);

}



static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = {

	.get_hcmd_size = iwl4965_get_hcmd_size,

	.build_addsta_hcmd = iwl4965_build_addsta_hcmd,
@@ -2229,6 +2241,7 @@ static struct iwl_hcmd_utils_ops iwl4965_hcmd_utils = { 
	.tx_cmd_protection = iwlcore_tx_cmd_protection,

	.calc_rssi = iwl4965_calc_rssi,

	.request_scan = iwlagn_request_scan,

	.post_scan = iwl4965_post_scan,

};



static struct iwl_lib_ops iwl4965_lib = {

drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c

+1 −0
Original line number Diff line number Diff line
@@ -384,4 +384,5 @@ struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = { 
	.tx_cmd_protection = iwlagn_tx_cmd_protection,

	.calc_rssi = iwlagn_calc_rssi,

	.request_scan = iwlagn_request_scan,

	.post_scan = iwlagn_post_scan,

};

drivers/net/wireless/iwlwifi/iwl-agn-lib.c

+16 −0
Original line number Diff line number Diff line
@@ -1565,6 +1565,22 @@ int iwlagn_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	return ret;

}



void iwlagn_post_scan(struct iwl_priv *priv)

{

	struct iwl_rxon_context *ctx;



	/*

	 * Since setting the RXON may have been deferred while

	 * performing the scan, fire one off if needed

	 */

	for_each_context(priv, ctx)

		if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))

			iwlagn_commit_rxon(priv, ctx);



	if (priv->cfg->ops->hcmd->set_pan_params)

		priv->cfg->ops->hcmd->set_pan_params(priv);

}



int iwlagn_manage_ibss_station(struct iwl_priv *priv,

			       struct ieee80211_vif *vif, bool add)

{