diff options
author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-03-17 16:34:36 -0400 |
---|---|---|
committer | Reinette Chatre <reinette.chatre@intel.com> | 2010-03-25 14:19:54 -0400 |
commit | 8d801080dd8d28bf7d85cacba131f18b7653ee49 (patch) | |
tree | dbc76a2a17d979695dfdfde95698c4eb72c95cfe /drivers/net/wireless/iwlwifi/iwl-4965.c | |
parent | 54b81550dd674466fe7d01629d2aab015c545a1e (diff) |
iwlwifi: more clean up to move agn only rx functions from iwlcore to iwlagn
Move more functions only used by agn driver from iwlcore to iwlagn.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-4965.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-4965.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-4965.c b/drivers/net/wireless/iwlwifi/iwl-4965.c index cee31cdf0a22..af48d07bb29d 100644 --- a/drivers/net/wireless/iwlwifi/iwl-4965.c +++ b/drivers/net/wireless/iwlwifi/iwl-4965.c | |||
@@ -1881,7 +1881,7 @@ static int iwl4965_tx_status_reply_tx(struct iwl_priv *priv, | |||
1881 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 1881 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
1882 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; | 1882 | info->flags &= ~IEEE80211_TX_CTL_AMPDU; |
1883 | info->flags |= iwl_tx_status_to_mac80211(status); | 1883 | info->flags |= iwl_tx_status_to_mac80211(status); |
1884 | iwl_hwrate_to_tx_control(priv, rate_n_flags, info); | 1884 | iwlagn_hwrate_to_tx_control(priv, rate_n_flags, info); |
1885 | /* FIXME: code repetition end */ | 1885 | /* FIXME: code repetition end */ |
1886 | 1886 | ||
1887 | IWL_DEBUG_TX_REPLY(priv, "1 Frame 0x%x failure :%d\n", | 1887 | IWL_DEBUG_TX_REPLY(priv, "1 Frame 0x%x failure :%d\n", |
@@ -2036,7 +2036,7 @@ static void iwl4965_rx_reply_tx(struct iwl_priv *priv, | |||
2036 | } else { | 2036 | } else { |
2037 | info->status.rates[0].count = tx_resp->failure_frame + 1; | 2037 | info->status.rates[0].count = tx_resp->failure_frame + 1; |
2038 | info->flags |= iwl_tx_status_to_mac80211(status); | 2038 | info->flags |= iwl_tx_status_to_mac80211(status); |
2039 | iwl_hwrate_to_tx_control(priv, | 2039 | iwlagn_hwrate_to_tx_control(priv, |
2040 | le32_to_cpu(tx_resp->rate_n_flags), | 2040 | le32_to_cpu(tx_resp->rate_n_flags), |
2041 | info); | 2041 | info); |
2042 | 2042 | ||
@@ -2102,7 +2102,7 @@ static int iwl4965_calc_rssi(struct iwl_priv *priv, | |||
2102 | static void iwl4965_rx_handler_setup(struct iwl_priv *priv) | 2102 | static void iwl4965_rx_handler_setup(struct iwl_priv *priv) |
2103 | { | 2103 | { |
2104 | /* Legacy Rx frames */ | 2104 | /* Legacy Rx frames */ |
2105 | priv->rx_handlers[REPLY_RX] = iwl_rx_reply_rx; | 2105 | priv->rx_handlers[REPLY_RX] = iwlagn_rx_reply_rx; |
2106 | /* Tx response */ | 2106 | /* Tx response */ |
2107 | priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx; | 2107 | priv->rx_handlers[REPLY_TX] = iwl4965_rx_reply_tx; |
2108 | } | 2108 | } |