iwlagn: direct call to post_scan function
authorWey-Yi Guy <wey-yi.w.guy@intel.com>
Fri, 3 Jun 2011 14:54:15 +0000 (07:54 -0700)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 3 Jun 2011 19:16:37 +0000 (15:16 -0400)
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>
drivers/net/wireless/iwlwifi/iwl-agn-hcmd.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-scan.c

index b12c72d..938230d 100644 (file)
@@ -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,
 };
index e430a4f..4ca0336 100644 (file)
@@ -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 {
index 8c9af45..438eecd 100644 (file)
@@ -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 @@ out_settings:
        if (!iwl_is_ready_rf(priv))
                goto out;
 
-       priv->cfg->ops->utils->post_scan(priv);
+       iwlagn_post_scan(priv);
 
 out:
        mutex_unlock(&priv->mutex);