diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2011-06-03 10:54:15 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-03 15:16:37 -0400 |
commit | e80d70e98b993a7ece93e29a408da4a7d57a4da2 (patch) | |
tree | a83f8c3d3e3ddb5d00e0a1c1f43fc5313313e3bc /drivers | |
parent | c2b821d7a59e5d6b53c906d0a8fecc68e2aee540 (diff) |
iwlagn: direct call to post_scan function
After driver split, no need to use function "ops" for post_scan.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-core.h | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-scan.c | 3 |
3 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c index b12c72d63ccb..938230d30ac0 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c | |||
@@ -332,5 +332,4 @@ struct iwl_hcmd_utils_ops iwlagn_hcmd_utils = { | |||
332 | .tx_cmd_protection = iwlagn_tx_cmd_protection, | 332 | .tx_cmd_protection = iwlagn_tx_cmd_protection, |
333 | .calc_rssi = iwlagn_calc_rssi, | 333 | .calc_rssi = iwlagn_calc_rssi, |
334 | .request_scan = iwlagn_request_scan, | 334 | .request_scan = iwlagn_request_scan, |
335 | .post_scan = iwlagn_post_scan, | ||
336 | }; | 335 | }; |
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h index e430a4fc8c59..4ca03360fbf9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-core.h +++ b/drivers/net/wireless/iwlwifi/iwl-core.h | |||
@@ -112,7 +112,6 @@ struct iwl_hcmd_utils_ops { | |||
112 | int (*calc_rssi)(struct iwl_priv *priv, | 112 | int (*calc_rssi)(struct iwl_priv *priv, |
113 | struct iwl_rx_phy_res *rx_resp); | 113 | struct iwl_rx_phy_res *rx_resp); |
114 | int (*request_scan)(struct iwl_priv *priv, struct ieee80211_vif *vif); | 114 | int (*request_scan)(struct iwl_priv *priv, struct ieee80211_vif *vif); |
115 | void (*post_scan)(struct iwl_priv *priv); | ||
116 | }; | 115 | }; |
117 | 116 | ||
118 | struct iwl_apm_ops { | 117 | struct iwl_apm_ops { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c index 8c9af45c598b..438eecd87335 100644 --- a/drivers/net/wireless/iwlwifi/iwl-scan.c +++ b/drivers/net/wireless/iwlwifi/iwl-scan.c | |||
@@ -36,6 +36,7 @@ | |||
36 | #include "iwl-sta.h" | 36 | #include "iwl-sta.h" |
37 | #include "iwl-io.h" | 37 | #include "iwl-io.h" |
38 | #include "iwl-helpers.h" | 38 | #include "iwl-helpers.h" |
39 | #include "iwl-agn.h" | ||
39 | 40 | ||
40 | /* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after | 41 | /* For active scan, listen ACTIVE_DWELL_TIME (msec) on each channel after |
41 | * sending probe req. This should be set long enough to hear probe responses | 42 | * sending probe req. This should be set long enough to hear probe responses |
@@ -600,7 +601,7 @@ out_settings: | |||
600 | if (!iwl_is_ready_rf(priv)) | 601 | if (!iwl_is_ready_rf(priv)) |
601 | goto out; | 602 | goto out; |
602 | 603 | ||
603 | priv->cfg->ops->utils->post_scan(priv); | 604 | iwlagn_post_scan(priv); |
604 | 605 | ||
605 | out: | 606 | out: |
606 | mutex_unlock(&priv->mutex); | 607 | mutex_unlock(&priv->mutex); |