Skip to content

L
linux
Commit c79dd5b5 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files
Options

iwlwifi: rename struct iwl4965_priv to struct iwl_priv 

This patch renames iwl4965_priv to iwl_priv. iwl_priv  will
be shared by more hw.
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 0a6857e7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 415 additions and 415 deletions
drivers/net/wireless/iwlwifi/iwl-4965-io.h
View file @ c79dd5b5
This diff is collapsed.
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
View file @ c79dd5b5
...@@ -162,11 +162,11 @@ struct iwl4965_lq_sta { ...@@ -162,11 +162,11 @@ struct iwl4965_lq_sta {
struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file; struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;
#endif #endif
struct iwl4965_rate dbg_fixed; struct iwl4965_rate dbg_fixed;
struct iwl4965_priv *drv; struct iwl_priv *drv;
#endif #endif
}; };
static void rs_rate_scale_perform(struct iwl4965_priv *priv, static void rs_rate_scale_perform(struct iwl_priv *priv,
struct net_device *dev, struct net_device *dev,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
struct sta_info *sta); struct sta_info *sta);
...@@ -229,7 +229,7 @@ static s32 expected_tpt_mimo40MHzSGI[IWL_RATE_COUNT] = { ...@@ -229,7 +229,7 @@ static s32 expected_tpt_mimo40MHzSGI[IWL_RATE_COUNT] = {
0, 0, 0, 0, 131, 131, 191, 222, 242, 270, 284, 289, 293 0, 0, 0, 0, 131, 131, 191, 222, 242, 270, 284, 289, 293
}; };
static int iwl4965_lq_sync_callback(struct iwl4965_priv *priv, static int iwl4965_lq_sync_callback(struct iwl_priv *priv,
struct iwl4965_cmd *cmd, struct sk_buff *skb) struct iwl4965_cmd *cmd, struct sk_buff *skb)
{ {
/*We didn't cache the SKB; let the caller free it */ /*We didn't cache the SKB; let the caller free it */
...@@ -241,7 +241,7 @@ static inline u8 iwl4965_rate_get_rate(u32 rate_n_flags) ...@@ -241,7 +241,7 @@ static inline u8 iwl4965_rate_get_rate(u32 rate_n_flags)
return (u8)(rate_n_flags & 0xFF); return (u8)(rate_n_flags & 0xFF);
} }
static int rs_send_lq_cmd(struct iwl4965_priv *priv, static int rs_send_lq_cmd(struct iwl_priv *priv,
struct iwl4965_link_quality_cmd *lq, u8 flags) struct iwl4965_link_quality_cmd *lq, u8 flags)
{ {
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
...@@ -388,7 +388,7 @@ static u32 rs_tl_get_load(struct iwl4965_lq_sta *lq_data, u8 tid) ...@@ -388,7 +388,7 @@ static u32 rs_tl_get_load(struct iwl4965_lq_sta *lq_data, u8 tid)
return tl->total; return tl->total;
} }
static void rs_tl_turn_on_agg_for_tid(struct iwl4965_priv *priv, static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
struct iwl4965_lq_sta *lq_data, u8 tid, struct iwl4965_lq_sta *lq_data, u8 tid,
struct sta_info *sta) struct sta_info *sta)
{ {
...@@ -407,7 +407,7 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl4965_priv *priv, ...@@ -407,7 +407,7 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl4965_priv *priv,
} }
} }
static void rs_tl_turn_on_agg(struct iwl4965_priv *priv, u8 tid, static void rs_tl_turn_on_agg(struct iwl_priv *priv, u8 tid,
struct iwl4965_lq_sta *lq_data, struct iwl4965_lq_sta *lq_data,
struct sta_info *sta) struct sta_info *sta)
{ {
...@@ -658,7 +658,7 @@ static inline void rs_toggle_antenna(struct iwl4965_rate *new_rate, ...@@ -658,7 +658,7 @@ static inline void rs_toggle_antenna(struct iwl4965_rate *new_rate,
} }
} }
static inline u8 rs_use_green(struct iwl4965_priv *priv, static inline u8 rs_use_green(struct iwl_priv *priv,
struct ieee80211_conf *conf) struct ieee80211_conf *conf)
{ {
#ifdef CONFIG_IWL4965_HT #ifdef CONFIG_IWL4965_HT
...@@ -821,7 +821,7 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev, ...@@ -821,7 +821,7 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev,
struct iwl4965_link_quality_cmd *table; struct iwl4965_link_quality_cmd *table;
struct sta_info *sta; struct sta_info *sta;
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate; struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr); struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
struct ieee80211_hw *hw = local_to_hw(local); struct ieee80211_hw *hw = local_to_hw(local);
struct iwl4965_rate_scale_data *window = NULL; struct iwl4965_rate_scale_data *window = NULL;
...@@ -1128,7 +1128,7 @@ static void rs_get_expected_tpt_table(struct iwl4965_lq_sta *lq_sta, ...@@ -1128,7 +1128,7 @@ static void rs_get_expected_tpt_table(struct iwl4965_lq_sta *lq_sta,
* to decrease to match "active" throughput. When moving from MIMO to SISO, * to decrease to match "active" throughput. When moving from MIMO to SISO,
* bit rate will typically need to increase, but not if performance was bad. * bit rate will typically need to increase, but not if performance was bad.
*/ */
static s32 rs_get_best_rate(struct iwl4965_priv *priv, static s32 rs_get_best_rate(struct iwl_priv *priv,
struct iwl4965_lq_sta *lq_sta, struct iwl4965_lq_sta *lq_sta,
struct iwl4965_scale_tbl_info *tbl, /* "search" */ struct iwl4965_scale_tbl_info *tbl, /* "search" */
u16 rate_mask, s8 index, s8 rate) u16 rate_mask, s8 index, s8 rate)
...@@ -1226,7 +1226,7 @@ static inline u8 rs_is_both_ant_supp(u8 valid_antenna) ...@@ -1226,7 +1226,7 @@ static inline u8 rs_is_both_ant_supp(u8 valid_antenna)
/* /*
* Set up search table for MIMO * Set up search table for MIMO
*/ */
static int rs_switch_to_mimo(struct iwl4965_priv *priv, static int rs_switch_to_mimo(struct iwl_priv *priv,
struct iwl4965_lq_sta *lq_sta, struct iwl4965_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct sta_info *sta, struct sta_info *sta,
...@@ -1291,7 +1291,7 @@ static int rs_switch_to_mimo(struct iwl4965_priv *priv, ...@@ -1291,7 +1291,7 @@ static int rs_switch_to_mimo(struct iwl4965_priv *priv,
/* /*
* Set up search table for SISO * Set up search table for SISO
*/ */
static int rs_switch_to_siso(struct iwl4965_priv *priv, static int rs_switch_to_siso(struct iwl_priv *priv,
struct iwl4965_lq_sta *lq_sta, struct iwl4965_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct sta_info *sta, struct sta_info *sta,
...@@ -1354,7 +1354,7 @@ static int rs_switch_to_siso(struct iwl4965_priv *priv, ...@@ -1354,7 +1354,7 @@ static int rs_switch_to_siso(struct iwl4965_priv *priv,
/* /*
* Try to switch to new modulation mode from legacy * Try to switch to new modulation mode from legacy
*/ */
static int rs_move_legacy_other(struct iwl4965_priv *priv, static int rs_move_legacy_other(struct iwl_priv *priv,
struct iwl4965_lq_sta *lq_sta, struct iwl4965_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct sta_info *sta, struct sta_info *sta,
...@@ -1452,7 +1452,7 @@ static int rs_move_legacy_other(struct iwl4965_priv *priv, ...@@ -1452,7 +1452,7 @@ static int rs_move_legacy_other(struct iwl4965_priv *priv,
/* /*
* Try to switch to new modulation mode from SISO * Try to switch to new modulation mode from SISO
*/ */
static int rs_move_siso_to_other(struct iwl4965_priv *priv, static int rs_move_siso_to_other(struct iwl_priv *priv,
struct iwl4965_lq_sta *lq_sta, struct iwl4965_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct sta_info *sta, struct sta_info *sta,
...@@ -1548,7 +1548,7 @@ static int rs_move_siso_to_other(struct iwl4965_priv *priv, ...@@ -1548,7 +1548,7 @@ static int rs_move_siso_to_other(struct iwl4965_priv *priv,
/* /*
* Try to switch to new modulation mode from MIMO * Try to switch to new modulation mode from MIMO
*/ */
static int rs_move_mimo_to_other(struct iwl4965_priv *priv, static int rs_move_mimo_to_other(struct iwl_priv *priv,
struct iwl4965_lq_sta *lq_sta, struct iwl4965_lq_sta *lq_sta,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct sta_info *sta, struct sta_info *sta,
...@@ -1728,7 +1728,7 @@ static void rs_stay_in_table(struct iwl4965_lq_sta *lq_sta) ...@@ -1728,7 +1728,7 @@ static void rs_stay_in_table(struct iwl4965_lq_sta *lq_sta)
/* /*
* Do rate scaling and search for new modulation mode. * Do rate scaling and search for new modulation mode.
*/ */
static void rs_rate_scale_perform(struct iwl4965_priv *priv, static void rs_rate_scale_perform(struct iwl_priv *priv,
struct net_device *dev, struct net_device *dev,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
struct sta_info *sta) struct sta_info *sta)
...@@ -2148,7 +2148,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv, ...@@ -2148,7 +2148,7 @@ static void rs_rate_scale_perform(struct iwl4965_priv *priv,
} }
static void rs_initialize_lq(struct iwl4965_priv *priv, static void rs_initialize_lq(struct iwl_priv *priv,
struct ieee80211_conf *conf, struct ieee80211_conf *conf,
struct sta_info *sta) struct sta_info *sta)
{ {
...@@ -2213,7 +2213,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev, ...@@ -2213,7 +2213,7 @@ static void rs_get_rate(void *priv_rate, struct net_device *dev,
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
struct sta_info *sta; struct sta_info *sta;
u16 fc; u16 fc;
struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate; struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
struct iwl4965_lq_sta *lq_sta; struct iwl4965_lq_sta *lq_sta;
IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n"); IWL_DEBUG_RATE_LIMIT("rate scale calculate new rate for skb\n");
...@@ -2294,7 +2294,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, ...@@ -2294,7 +2294,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
int i, j; int i, j;
struct ieee80211_conf *conf = &local->hw.conf; struct ieee80211_conf *conf = &local->hw.conf;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
struct iwl4965_priv *priv = (struct iwl4965_priv *)priv_rate; struct iwl_priv *priv = (struct iwl_priv *)priv_rate;
struct iwl4965_lq_sta *lq_sta = priv_sta; struct iwl4965_lq_sta *lq_sta = priv_sta;
sband = local->hw.wiphy->bands[local->hw.conf.channel->band]; sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
...@@ -2516,7 +2516,7 @@ static void rs_free(void *priv_rate) ...@@ -2516,7 +2516,7 @@ static void rs_free(void *priv_rate)
static void rs_clear(void *priv_rate) static void rs_clear(void *priv_rate)
{ {
struct iwl4965_priv *priv = (struct iwl4965_priv *) priv_rate; struct iwl_priv *priv = (struct iwl_priv *) priv_rate;
IWL_DEBUG_RATE("enter\n"); IWL_DEBUG_RATE("enter\n");
...@@ -2726,7 +2726,7 @@ static struct rate_control_ops rs_ops = { ...@@ -2726,7 +2726,7 @@ static struct rate_control_ops rs_ops = {
int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id) int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
{ {
struct ieee80211_local *local = hw_to_local(hw); struct ieee80211_local *local = hw_to_local(hw);
struct iwl4965_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
struct iwl4965_lq_sta *lq_sta; struct iwl4965_lq_sta *lq_sta;
struct sta_info *sta; struct sta_info *sta;
int cnt = 0, i; int cnt = 0, i;
...@@ -2816,7 +2816,7 @@ int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id) ...@@ -2816,7 +2816,7 @@ int iwl4965_fill_rs_info(struct ieee80211_hw *hw, char *buf, u8 sta_id)
void iwl4965_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) void iwl4965_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)
{ {
struct iwl4965_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
priv->lq_mngr.lq_ready = 1; priv->lq_mngr.lq_ready = 1;
} }
......
drivers/net/wireless/iwlwifi/iwl-4965.c
View file @ c79dd5b5
This diff is collapsed.
drivers/net/wireless/iwlwifi/iwl-4965.h
View file @ c79dd5b5
This diff is collapsed.
drivers/net/wireless/iwlwifi/iwl-eeprom.c
View file @ c79dd5b5
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
* *
******************************************************************************/ ******************************************************************************/
int iwlcore_eeprom_verify_signature(struct iwl4965_priv *priv) int iwlcore_eeprom_verify_signature(struct iwl_priv *priv)
{ {
u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP); u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP);
if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) { if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
...@@ -98,7 +98,7 @@ EXPORT_SYMBOL(iwlcore_eeprom_verify_signature); ...@@ -98,7 +98,7 @@ EXPORT_SYMBOL(iwlcore_eeprom_verify_signature);
* EEPROM chip, not a single event, so even reads could conflict if they * EEPROM chip, not a single event, so even reads could conflict if they
* weren't arbitrated by the semaphore. * weren't arbitrated by the semaphore.
*/ */
int iwlcore_eeprom_acquire_semaphore(struct iwl4965_priv *priv) int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv)
{ {
u16 count; u16 count;
int ret; int ret;
...@@ -124,7 +124,7 @@ int iwlcore_eeprom_acquire_semaphore(struct iwl4965_priv *priv) ...@@ -124,7 +124,7 @@ int iwlcore_eeprom_acquire_semaphore(struct iwl4965_priv *priv)
} }
EXPORT_SYMBOL(iwlcore_eeprom_acquire_semaphore); EXPORT_SYMBOL(iwlcore_eeprom_acquire_semaphore);
void iwlcore_eeprom_release_semaphore(struct iwl4965_priv *priv) void iwlcore_eeprom_release_semaphore(struct iwl_priv *priv)
{ {
iwl4965_clear_bit(priv, CSR_HW_IF_CONFIG_REG, iwl4965_clear_bit(priv, CSR_HW_IF_CONFIG_REG,
CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM); CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
...@@ -140,7 +140,7 @@ EXPORT_SYMBOL(iwlcore_eeprom_release_semaphore); ...@@ -140,7 +140,7 @@ EXPORT_SYMBOL(iwlcore_eeprom_release_semaphore);
* *
* NOTE: This routine uses the non-debug IO access functions. * NOTE: This routine uses the non-debug IO access functions.
*/ */
int iwl_eeprom_init(struct iwl4965_priv *priv) int iwl_eeprom_init(struct iwl_priv *priv)
{ {
u16 *e = (u16 *)&priv->eeprom; u16 *e = (u16 *)&priv->eeprom;
u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP); u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP);
...@@ -197,7 +197,7 @@ int iwl_eeprom_init(struct iwl4965_priv *priv) ...@@ -197,7 +197,7 @@ int iwl_eeprom_init(struct iwl4965_priv *priv)
EXPORT_SYMBOL(iwl_eeprom_init); EXPORT_SYMBOL(iwl_eeprom_init);
void iwl_eeprom_get_mac(const struct iwl4965_priv *priv, u8 *mac) void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac)
{ {
memcpy(mac, priv->eeprom.mac_address, 6); memcpy(mac, priv->eeprom.mac_address, 6);
} }
......
drivers/net/wireless/iwlwifi/iwl-eeprom.h
View file @ c79dd5b5
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
#ifndef __iwl_eeprom_h__ #ifndef __iwl_eeprom_h__
#define __iwl_eeprom_h__ #define __iwl_eeprom_h__
struct iwl4965_priv; struct iwl_priv;
/* /*
* EEPROM access time values: * EEPROM access time values:
...@@ -383,17 +383,17 @@ struct iwl4965_eeprom { ...@@ -383,17 +383,17 @@ struct iwl4965_eeprom {
/* End of EEPROM */ /* End of EEPROM */
struct iwl_eeprom_ops { struct iwl_eeprom_ops {
int (*verify_signature) (struct iwl4965_priv *priv); int (*verify_signature) (struct iwl_priv *priv);
int (*acquire_semaphore) (struct iwl4965_priv *priv); int (*acquire_semaphore) (struct iwl_priv *priv);
void (*release_semaphore) (struct iwl4965_priv *priv); void (*release_semaphore) (struct iwl_priv *priv);
}; };
void iwl_eeprom_get_mac(const struct iwl4965_priv *priv, u8 *mac); void iwl_eeprom_get_mac(const struct iwl_priv *priv, u8 *mac);
int iwl_eeprom_init(struct iwl4965_priv *priv); int iwl_eeprom_init(struct iwl_priv *priv);
int iwlcore_eeprom_verify_signature(struct iwl4965_priv *priv); int iwlcore_eeprom_verify_signature(struct iwl_priv *priv);
int iwlcore_eeprom_acquire_semaphore(struct iwl4965_priv *priv); int iwlcore_eeprom_acquire_semaphore(struct iwl_priv *priv);
void iwlcore_eeprom_release_semaphore(struct iwl4965_priv *priv); void iwlcore_eeprom_release_semaphore(struct iwl_priv *priv);
#endif /* __iwl_eeprom_h__ */ #endif /* __iwl_eeprom_h__ */
drivers/net/wireless/iwlwifi/iwl4965-base.c
View file @ c79dd5b5
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7