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

Commit e80d70e9 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlagn: direct call to post_scan function 



After driver split, no need to use function "ops" for post_scan.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c2b821d7

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

+0 −1
Original line number Diff line number Diff line
@@ -332,5 +332,4 @@ 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-core.h

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ struct iwl_hcmd_utils_ops { 
	int  (*calc_rssi)(struct iwl_priv *priv,

			  struct iwl_rx_phy_res *rx_resp);

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

	void (*post_scan)(struct iwl_priv *priv);

};



struct iwl_apm_ops {

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

+2 −1
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "iwl-sta.h"

#include "iwl-io.h"

#include "iwl-helpers.h"

#include "iwl-agn.h"



/* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after

 * sending probe req.  This should be set long enough to hear probe responses
@@ -600,7 +601,7 @@ static void iwl_bg_scan_completed(struct work_struct *work) 
	if (!iwl_is_ready_rf(priv))

		goto out;



	priv->cfg->ops->utils->post_scan(priv);

	iwlagn_post_scan(priv);



out:

	mutex_unlock(&priv->mutex);