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

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

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

drivers/net/wireless/iwlwifi/iwl-4965-io.h

+29 −29
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 


#define _iwl4965_write32(priv, ofs, val) writel((val), (priv)->hw_base + (ofs))

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv *priv,

static inline void __iwl4965_write32(const char *f, u32 l, struct iwl_priv *priv,

				 u32 ofs, u32 val)

{

	IWL_DEBUG_IO("write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l);
@@ -75,7 +75,7 @@ static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv * 


#define _iwl4965_read32(priv, ofs) readl((priv)->hw_base + (ofs))

#ifdef CONFIG_IWLWIFI_DEBUG

static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl4965_priv *priv, u32 ofs)

static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl_priv *priv, u32 ofs)

{

	IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);

	return _iwl4965_read32(priv, ofs);
@@ -85,7 +85,7 @@ static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl4965_priv *priv, u3 
#define iwl4965_read32(p, o) _iwl4965_read32(p, o)

#endif



static inline int _iwl4965_poll_bit(struct iwl4965_priv *priv, u32 addr,

static inline int _iwl4965_poll_bit(struct iwl_priv *priv, u32 addr,

				u32 bits, u32 mask, int timeout)

{

	int i = 0;
@@ -101,7 +101,7 @@ static inline int _iwl4965_poll_bit(struct iwl4965_priv *priv, u32 addr, 
}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline int __iwl4965_poll_bit(const char *f, u32 l,

				 struct iwl4965_priv *priv, u32 addr,

				 struct iwl_priv *priv, u32 addr,

				 u32 bits, u32 mask, int timeout)

{

	int ret = _iwl4965_poll_bit(priv, addr, bits, mask, timeout);
@@ -116,13 +116,13 @@ static inline int __iwl4965_poll_bit(const char *f, u32 l, 
#define iwl4965_poll_bit(p, a, b, m, t) _iwl4965_poll_bit(p, a, b, m, t)

#endif



static inline void _iwl4965_set_bit(struct iwl4965_priv *priv, u32 reg, u32 mask)

static inline void _iwl4965_set_bit(struct iwl_priv *priv, u32 reg, u32 mask)

{

	_iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) | mask);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_set_bit(const char *f, u32 l,

				 struct iwl4965_priv *priv, u32 reg, u32 mask)

				 struct iwl_priv *priv, u32 reg, u32 mask)

{

	u32 val = _iwl4965_read32(priv, reg) | mask;

	IWL_DEBUG_IO("set_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
@@ -133,13 +133,13 @@ static inline void __iwl4965_set_bit(const char *f, u32 l, 
#define iwl4965_set_bit(p, r, m) _iwl4965_set_bit(p, r, m)

#endif



static inline void _iwl4965_clear_bit(struct iwl4965_priv *priv, u32 reg, u32 mask)

static inline void _iwl4965_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask)

{

	_iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) & ~mask);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_clear_bit(const char *f, u32 l,

				   struct iwl4965_priv *priv, u32 reg, u32 mask)

				   struct iwl_priv *priv, u32 reg, u32 mask)

{

	u32 val = _iwl4965_read32(priv, reg) & ~mask;

	IWL_DEBUG_IO("clear_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val);
@@ -150,7 +150,7 @@ static inline void __iwl4965_clear_bit(const char *f, u32 l, 
#define iwl4965_clear_bit(p, r, m) _iwl4965_clear_bit(p, r, m)

#endif



static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv)

static inline int _iwl4965_grab_nic_access(struct iwl_priv *priv)

{

	int ret;

	u32 gp_ctl;
@@ -194,7 +194,7 @@ static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv) 


#ifdef CONFIG_IWLWIFI_DEBUG

static inline int __iwl4965_grab_nic_access(const char *f, u32 l,

					       struct iwl4965_priv *priv)

					       struct iwl_priv *priv)

{

	if (atomic_read(&priv->restrict_refcnt))

		IWL_DEBUG_INFO("Grabbing access while already held at "
@@ -210,7 +210,7 @@ static inline int __iwl4965_grab_nic_access(const char *f, u32 l, 
	_iwl4965_grab_nic_access(priv)

#endif



static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv)

static inline void _iwl4965_release_nic_access(struct iwl_priv *priv)

{

#ifdef CONFIG_IWLWIFI_DEBUG

	if (atomic_dec_and_test(&priv->restrict_refcnt))
@@ -220,7 +220,7 @@ static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv) 
}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_release_nic_access(const char *f, u32 l,

					    struct iwl4965_priv *priv)

					    struct iwl_priv *priv)

{

	if (atomic_read(&priv->restrict_refcnt) <= 0)

		IWL_ERROR("Release unheld nic access at line %d.\n", l);
@@ -235,13 +235,13 @@ static inline void __iwl4965_release_nic_access(const char *f, u32 l, 
	_iwl4965_release_nic_access(priv)

#endif



static inline u32 _iwl4965_read_direct32(struct iwl4965_priv *priv, u32 reg)

static inline u32 _iwl4965_read_direct32(struct iwl_priv *priv, u32 reg)

{

	return _iwl4965_read32(priv, reg);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline u32 __iwl4965_read_direct32(const char *f, u32 l,

					struct iwl4965_priv *priv, u32 reg)

					struct iwl_priv *priv, u32 reg)

{

	u32 value = _iwl4965_read_direct32(priv, reg);

	if (!atomic_read(&priv->restrict_refcnt))
@@ -256,14 +256,14 @@ static inline u32 __iwl4965_read_direct32(const char *f, u32 l, 
#define iwl4965_read_direct32 _iwl4965_read_direct32

#endif



static inline void _iwl4965_write_direct32(struct iwl4965_priv *priv,

static inline void _iwl4965_write_direct32(struct iwl_priv *priv,

					 u32 reg, u32 value)

{

	_iwl4965_write32(priv, reg, value);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static void __iwl4965_write_direct32(u32 line,

				   struct iwl4965_priv *priv, u32 reg, u32 value)

				   struct iwl_priv *priv, u32 reg, u32 value)

{

	if (!atomic_read(&priv->restrict_refcnt))

		IWL_ERROR("Nic access not held from line %d\n", line);
@@ -275,7 +275,7 @@ static void __iwl4965_write_direct32(u32 line, 
#define iwl4965_write_direct32 _iwl4965_write_direct32

#endif



static inline void iwl4965_write_reg_buf(struct iwl4965_priv *priv,

static inline void iwl4965_write_reg_buf(struct iwl_priv *priv,

					       u32 reg, u32 len, u32 *values)

{

	u32 count = sizeof(u32);
@@ -286,7 +286,7 @@ static inline void iwl4965_write_reg_buf(struct iwl4965_priv *priv, 
	}

}



static inline int _iwl4965_poll_direct_bit(struct iwl4965_priv *priv,

static inline int _iwl4965_poll_direct_bit(struct iwl_priv *priv,

					   u32 addr, u32 mask, int timeout)

{

	int i = 0;
@@ -303,7 +303,7 @@ static inline int _iwl4965_poll_direct_bit(struct iwl4965_priv *priv, 


#ifdef CONFIG_IWLWIFI_DEBUG

static inline int __iwl4965_poll_direct_bit(const char *f, u32 l,

					    struct iwl4965_priv *priv,

					    struct iwl_priv *priv,

					    u32 addr, u32 mask, int timeout)

{

	int ret  = _iwl4965_poll_direct_bit(priv, addr, mask, timeout);
@@ -322,13 +322,13 @@ static inline int __iwl4965_poll_direct_bit(const char *f, u32 l, 
#define iwl4965_poll_direct_bit _iwl4965_poll_direct_bit

#endif



static inline u32 _iwl4965_read_prph(struct iwl4965_priv *priv, u32 reg)

static inline u32 _iwl4965_read_prph(struct iwl_priv *priv, u32 reg)

{

	_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));

	return _iwl4965_read_direct32(priv, HBUS_TARG_PRPH_RDAT);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline u32 __iwl4965_read_prph(u32 line, struct iwl4965_priv *priv, u32 reg)

static inline u32 __iwl4965_read_prph(u32 line, struct iwl_priv *priv, u32 reg)

{

	if (!atomic_read(&priv->restrict_refcnt))

		IWL_ERROR("Nic access not held from line %d\n", line);
@@ -341,7 +341,7 @@ static inline u32 __iwl4965_read_prph(u32 line, struct iwl4965_priv *priv, u32 r 
#define iwl4965_read_prph _iwl4965_read_prph

#endif



static inline void _iwl4965_write_prph(struct iwl4965_priv *priv,

static inline void _iwl4965_write_prph(struct iwl_priv *priv,

					     u32 addr, u32 val)

{

	_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
@@ -349,7 +349,7 @@ static inline void _iwl4965_write_prph(struct iwl4965_priv *priv, 
	_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);

}

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv,

static inline void __iwl4965_write_prph(u32 line, struct iwl_priv *priv,

					      u32 addr, u32 val)

{

	if (!atomic_read(&priv->restrict_refcnt))
@@ -366,7 +366,7 @@ static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv, 
#define _iwl4965_set_bits_prph(priv, reg, mask) \

	_iwl4965_write_prph(priv, reg, (_iwl4965_read_prph(priv, reg) | mask))

#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv,

static inline void __iwl4965_set_bits_prph(u32 line, struct iwl_priv *priv,

					u32 reg, u32 mask)

{

	if (!atomic_read(&priv->restrict_refcnt))
@@ -385,7 +385,7 @@ static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv, 


#ifdef CONFIG_IWLWIFI_DEBUG

static inline void __iwl4965_set_bits_mask_prph(u32 line,

		struct iwl4965_priv *priv, u32 reg, u32 bits, u32 mask)

		struct iwl_priv *priv, u32 reg, u32 bits, u32 mask)

{

	if (!atomic_read(&priv->restrict_refcnt))

		IWL_ERROR("Nic access not held from line %d\n", line);
@@ -397,26 +397,26 @@ static inline void __iwl4965_set_bits_mask_prph(u32 line, 
#define iwl4965_set_bits_mask_prph _iwl4965_set_bits_mask_prph

#endif



static inline void iwl4965_clear_bits_prph(struct iwl4965_priv

static inline void iwl4965_clear_bits_prph(struct iwl_priv

						 *priv, u32 reg, u32 mask)

{

	u32 val = _iwl4965_read_prph(priv, reg);

	_iwl4965_write_prph(priv, reg, (val & ~mask));

}



static inline u32 iwl4965_read_targ_mem(struct iwl4965_priv *priv, u32 addr)

static inline u32 iwl4965_read_targ_mem(struct iwl_priv *priv, u32 addr)

{

	iwl4965_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);

	return iwl4965_read_direct32(priv, HBUS_TARG_MEM_RDAT);

}



static inline void iwl4965_write_targ_mem(struct iwl4965_priv *priv, u32 addr, u32 val)

static inline void iwl4965_write_targ_mem(struct iwl_priv *priv, u32 addr, u32 val)

{

	iwl4965_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);

	iwl4965_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);

}



static inline void iwl4965_write_targ_mem_buf(struct iwl4965_priv *priv, u32 addr,

static inline void iwl4965_write_targ_mem_buf(struct iwl_priv *priv, u32 addr,

					  u32 len, u32 *values)

{

	iwl4965_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);

drivers/net/wireless/iwlwifi/iwl-4965-rs.c

+21 −21
Original line number Diff line number Diff line
@@ -162,11 +162,11 @@ struct iwl4965_lq_sta { 
	struct dentry *rs_sta_dbgfs_tx_agg_tid_en_file;

#endif

	struct iwl4965_rate dbg_fixed;

	struct iwl4965_priv *drv;

	struct iwl_priv *drv;

#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 ieee80211_hdr *hdr,

				   struct sta_info *sta);
@@ -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

};



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)

{

	/*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) 
	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)

{

#ifdef CONFIG_IWLWIFI_DEBUG
@@ -388,7 +388,7 @@ static u32 rs_tl_get_load(struct iwl4965_lq_sta *lq_data, u8 tid) 
	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 sta_info *sta)

{
@@ -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 sta_info *sta)

{
@@ -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)

{

#ifdef CONFIG_IWL4965_HT
@@ -821,7 +821,7 @@ static void rs_tx_status(void *priv_rate, struct net_device *dev, 
	struct iwl4965_link_quality_cmd *table;

	struct sta_info *sta;

	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_hw *hw = local_to_hw(local);

	struct iwl4965_rate_scale_data *window = NULL;
@@ -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,

 * 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_scale_tbl_info *tbl,	/* "search" */

			    u16 rate_mask, s8 index, s8 rate)
@@ -1226,7 +1226,7 @@ static inline u8 rs_is_both_ant_supp(u8 valid_antenna) 
/*

 * 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 ieee80211_conf *conf,

			     struct sta_info *sta,
@@ -1291,7 +1291,7 @@ static int rs_switch_to_mimo(struct iwl4965_priv *priv, 
/*

 * 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 ieee80211_conf *conf,

			     struct sta_info *sta,
@@ -1354,7 +1354,7 @@ static int rs_switch_to_siso(struct iwl4965_priv *priv, 
/*

 * 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 ieee80211_conf *conf,

				struct sta_info *sta,
@@ -1452,7 +1452,7 @@ static int rs_move_legacy_other(struct iwl4965_priv *priv, 
/*

 * 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 ieee80211_conf *conf,

				 struct sta_info *sta,
@@ -1548,7 +1548,7 @@ static int rs_move_siso_to_other(struct iwl4965_priv *priv, 
/*

 * 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 ieee80211_conf *conf,

				 struct sta_info *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.

 */

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 ieee80211_hdr *hdr,

				  struct sta_info *sta)
@@ -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 sta_info *sta)

{
@@ -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 sta_info *sta;

	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;



	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, 
	int i, j;

	struct ieee80211_conf *conf = &local->hw.conf;

	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;



	sband = local->hw.wiphy->bands[local->hw.conf.channel->band];
@@ -2516,7 +2516,7 @@ static void rs_free(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");
@@ -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)

{

	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 sta_info *sta;

	int cnt = 0, i;
@@ -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)

{

	struct iwl4965_priv *priv = hw->priv;

	struct iwl_priv *priv = hw->priv;



	priv->lq_mngr.lq_ready = 1;

}

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

+89 −89

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/wireless/iwlwifi/iwl-4965.h

+64 −64
Original line number Diff line number Diff line
@@ -315,13 +315,13 @@ enum { 
};



struct iwl4965_cmd;

struct iwl4965_priv;

struct iwl_priv;



struct iwl4965_cmd_meta {

	struct iwl4965_cmd_meta *source;

	union {

		struct sk_buff *skb;

		int (*callback)(struct iwl4965_priv *priv,

		int (*callback)(struct iwl_priv *priv,

				struct iwl4965_cmd *cmd, struct sk_buff *skb);

	} __attribute__ ((packed)) u;
@@ -634,40 +634,40 @@ struct iwl4965_driver_hw_info { 
 *

 *****************************************************************************/

struct iwl4965_addsta_cmd;

extern int iwl4965_send_add_station(struct iwl4965_priv *priv,

extern int iwl4965_send_add_station(struct iwl_priv *priv,

				struct iwl4965_addsta_cmd *sta, u8 flags);

extern u8 iwl4965_add_station_flags(struct iwl4965_priv *priv, const u8 *addr,

extern u8 iwl4965_add_station_flags(struct iwl_priv *priv, const u8 *addr,

			  int is_ap, u8 flags, void *ht_data);

extern int iwl4965_is_network_packet(struct iwl4965_priv *priv,

extern int iwl4965_is_network_packet(struct iwl_priv *priv,

				 struct ieee80211_hdr *header);

extern int iwl4965_power_init_handle(struct iwl4965_priv *priv);

extern void iwl4965_handle_data_packet_monitor(struct iwl4965_priv *priv,

extern int iwl4965_power_init_handle(struct iwl_priv *priv);

extern void iwl4965_handle_data_packet_monitor(struct iwl_priv *priv,

					   struct iwl4965_rx_mem_buffer *rxb,

					   void *data, short len,

					   struct ieee80211_rx_status *stats,

					   u16 phy_flags);

extern int iwl4965_is_duplicate_packet(struct iwl4965_priv *priv,

extern int iwl4965_is_duplicate_packet(struct iwl_priv *priv,

				       struct ieee80211_hdr *header);

extern int iwl4965_rx_queue_alloc(struct iwl4965_priv *priv);

extern void iwl4965_rx_queue_reset(struct iwl4965_priv *priv,

extern int iwl4965_rx_queue_alloc(struct iwl_priv *priv);

extern void iwl4965_rx_queue_reset(struct iwl_priv *priv,

			       struct iwl4965_rx_queue *rxq);

extern int iwl4965_calc_db_from_ratio(int sig_ratio);

extern int iwl4965_calc_sig_qual(int rssi_dbm, int noise_dbm);

extern int iwl4965_tx_queue_init(struct iwl4965_priv *priv,

extern int iwl4965_tx_queue_init(struct iwl_priv *priv,

			     struct iwl4965_tx_queue *txq, int count, u32 id);

extern void iwl4965_rx_replenish(void *data);

extern void iwl4965_tx_queue_free(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq);

extern int iwl4965_send_cmd_pdu(struct iwl4965_priv *priv, u8 id, u16 len,

extern void iwl4965_tx_queue_free(struct iwl_priv *priv, struct iwl4965_tx_queue *txq);

extern int iwl4965_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len,

			    const void *data);

extern int __must_check iwl4965_send_cmd(struct iwl4965_priv *priv,

extern int __must_check iwl4965_send_cmd(struct iwl_priv *priv,

		struct iwl4965_host_cmd *cmd);

extern unsigned int iwl4965_fill_beacon_frame(struct iwl4965_priv *priv,

extern unsigned int iwl4965_fill_beacon_frame(struct iwl_priv *priv,

					struct ieee80211_hdr *hdr,

					const u8 *dest, int left);

extern int iwl4965_rx_queue_update_write_ptr(struct iwl4965_priv *priv,

extern int iwl4965_rx_queue_update_write_ptr(struct iwl_priv *priv,

					 struct iwl4965_rx_queue *q);

extern int iwl4965_send_statistics_request(struct iwl4965_priv *priv);

extern void iwl4965_set_decrypted_flag(struct iwl4965_priv *priv, struct sk_buff *skb,

extern int iwl4965_send_statistics_request(struct iwl_priv *priv);

extern void iwl4965_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,

				   u32 decrypt_res,

				   struct ieee80211_rx_status *stats);

extern __le16 *ieee80211_get_qos_ctrl(struct ieee80211_hdr *hdr);
@@ -678,7 +678,7 @@ extern const u8 iwl4965_broadcast_addr[ETH_ALEN]; 
 * Currently used by iwl-3945-rs... look at restructuring so that it doesn't

 * call this... todo... fix that.

*/

extern u8 iwl4965_sync_station(struct iwl4965_priv *priv, int sta_id,

extern u8 iwl4965_sync_station(struct iwl_priv *priv, int sta_id,

			   u16 tx_rate, u8 flags);



/******************************************************************************
@@ -697,36 +697,36 @@ extern u8 iwl4965_sync_station(struct iwl4965_priv *priv, int sta_id, 
 * iwl4965_mac_     <-- mac80211 callback

 *

 ****************************************************************************/

extern void iwl4965_hw_rx_handler_setup(struct iwl4965_priv *priv);

extern void iwl4965_hw_setup_deferred_work(struct iwl4965_priv *priv);

extern void iwl4965_hw_cancel_deferred_work(struct iwl4965_priv *priv);

extern int iwl4965_hw_rxq_stop(struct iwl4965_priv *priv);

extern int iwl4965_hw_set_hw_setting(struct iwl4965_priv *priv);

extern int iwl4965_hw_nic_init(struct iwl4965_priv *priv);

extern int iwl4965_hw_nic_stop_master(struct iwl4965_priv *priv);

extern void iwl4965_hw_txq_ctx_free(struct iwl4965_priv *priv);

extern void iwl4965_hw_txq_ctx_stop(struct iwl4965_priv *priv);

extern int iwl4965_hw_nic_reset(struct iwl4965_priv *priv);

extern int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl4965_priv *priv, void *tfd,

extern void iwl4965_hw_rx_handler_setup(struct iwl_priv *priv);

extern void iwl4965_hw_setup_deferred_work(struct iwl_priv *priv);

extern void iwl4965_hw_cancel_deferred_work(struct iwl_priv *priv);

extern int iwl4965_hw_rxq_stop(struct iwl_priv *priv);

extern int iwl4965_hw_set_hw_setting(struct iwl_priv *priv);

extern int iwl4965_hw_nic_init(struct iwl_priv *priv);

extern int iwl4965_hw_nic_stop_master(struct iwl_priv *priv);

extern void iwl4965_hw_txq_ctx_free(struct iwl_priv *priv);

extern void iwl4965_hw_txq_ctx_stop(struct iwl_priv *priv);

extern int iwl4965_hw_nic_reset(struct iwl_priv *priv);

extern int iwl4965_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd,

					dma_addr_t addr, u16 len);

extern int iwl4965_hw_txq_free_tfd(struct iwl4965_priv *priv, struct iwl4965_tx_queue *txq);

extern int iwl4965_hw_get_temperature(struct iwl4965_priv *priv);

extern int iwl4965_hw_tx_queue_init(struct iwl4965_priv *priv,

extern int iwl4965_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl4965_tx_queue *txq);

extern int iwl4965_hw_get_temperature(struct iwl_priv *priv);

extern int iwl4965_hw_tx_queue_init(struct iwl_priv *priv,

				struct iwl4965_tx_queue *txq);

extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl4965_priv *priv,

extern unsigned int iwl4965_hw_get_beacon_cmd(struct iwl_priv *priv,

				 struct iwl4965_frame *frame, u8 rate);

extern int iwl4965_hw_get_rx_read(struct iwl4965_priv *priv);

extern void iwl4965_hw_build_tx_cmd_rate(struct iwl4965_priv *priv,

extern int iwl4965_hw_get_rx_read(struct iwl_priv *priv);

extern void iwl4965_hw_build_tx_cmd_rate(struct iwl_priv *priv,

				     struct iwl4965_cmd *cmd,

				     struct ieee80211_tx_control *ctrl,

				     struct ieee80211_hdr *hdr,

				     int sta_id, int tx_id);

extern int iwl4965_hw_reg_send_txpower(struct iwl4965_priv *priv);

extern int iwl4965_hw_reg_set_txpower(struct iwl4965_priv *priv, s8 power);

extern void iwl4965_hw_rx_statistics(struct iwl4965_priv *priv,

extern int iwl4965_hw_reg_send_txpower(struct iwl_priv *priv);

extern int iwl4965_hw_reg_set_txpower(struct iwl_priv *priv, s8 power);

extern void iwl4965_hw_rx_statistics(struct iwl_priv *priv,

				 struct iwl4965_rx_mem_buffer *rxb);

extern void iwl4965_disable_events(struct iwl4965_priv *priv);

extern int iwl4965_get_temperature(const struct iwl4965_priv *priv);

extern void iwl4965_disable_events(struct iwl_priv *priv);

extern int iwl4965_get_temperature(const struct iwl_priv *priv);



/**

 * iwl4965_hw_find_station - Find station id for a given BSSID
@@ -736,48 +736,48 @@ extern int iwl4965_get_temperature(const struct iwl4965_priv *priv); 
 * not yet been merged into a single common layer for managing the

 * station tables.

 */

extern u8 iwl4965_hw_find_station(struct iwl4965_priv *priv, const u8 *bssid);

extern u8 iwl4965_hw_find_station(struct iwl_priv *priv, const u8 *bssid);



extern int iwl4965_hw_channel_switch(struct iwl4965_priv *priv, u16 channel);

extern int iwl4965_tx_queue_reclaim(struct iwl4965_priv *priv, int txq_id, int index);

extern int iwl4965_hw_channel_switch(struct iwl_priv *priv, u16 channel);

extern int iwl4965_tx_queue_reclaim(struct iwl_priv *priv, int txq_id, int index);

extern int iwl4965_queue_space(const struct iwl4965_queue *q);

struct iwl4965_priv;

struct iwl_priv;



/*

 * Forward declare iwl-4965.c functions for iwl-base.c

 */

extern int iwl4965_tx_queue_update_wr_ptr(struct iwl4965_priv *priv,

extern int iwl4965_tx_queue_update_wr_ptr(struct iwl_priv *priv,

					  struct iwl4965_tx_queue *txq,

					  u16 byte_cnt);

extern void iwl4965_add_station(struct iwl4965_priv *priv, const u8 *addr,

extern void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr,

				int is_ap);

extern void iwl4965_set_rxon_chain(struct iwl4965_priv *priv);

extern int iwl4965_alive_notify(struct iwl4965_priv *priv);

extern void iwl4965_update_rate_scaling(struct iwl4965_priv *priv, u8 mode);

extern void iwl4965_chain_noise_reset(struct iwl4965_priv *priv);

extern void iwl4965_init_sensitivity(struct iwl4965_priv *priv, u8 flags,

extern void iwl4965_set_rxon_chain(struct iwl_priv *priv);

extern int iwl4965_alive_notify(struct iwl_priv *priv);

extern void iwl4965_update_rate_scaling(struct iwl_priv *priv, u8 mode);

extern void iwl4965_chain_noise_reset(struct iwl_priv *priv);

extern void iwl4965_init_sensitivity(struct iwl_priv *priv, u8 flags,

				     u8 force);

extern int iwl4965_set_fat_chan_info(struct iwl4965_priv *priv,

extern int iwl4965_set_fat_chan_info(struct iwl_priv *priv,

				enum ieee80211_band band,

				u16 channel,

				const struct iwl4965_eeprom_channel *eeprom_ch,

				u8 fat_extension_channel);

extern void iwl4965_rf_kill_ct_config(struct iwl4965_priv *priv);

extern void iwl4965_hwrate_to_tx_control(struct iwl4965_priv *priv,

extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv);

extern void iwl4965_hwrate_to_tx_control(struct iwl_priv *priv,

					 u32 rate_n_flags,

					 struct ieee80211_tx_control *control);



#ifdef CONFIG_IWL4965_HT

void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info,

			      enum ieee80211_band band);

void iwl4965_set_rxon_ht(struct iwl4965_priv *priv,

void iwl4965_set_rxon_ht(struct iwl_priv *priv,

			 struct iwl_ht_info *ht_info);

void iwl4965_set_ht_add_station(struct iwl4965_priv *priv, u8 index,

void iwl4965_set_ht_add_station(struct iwl_priv *priv, u8 index,

				struct ieee80211_ht_info *sta_ht_inf);

int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,

				    enum ieee80211_ampdu_mlme_action action,

				    const u8 *addr, u16 tid, u16 *ssn);

int iwl4965_check_empty_hw_queue(struct iwl4965_priv *priv, int sta_id,

int iwl4965_check_empty_hw_queue(struct iwl_priv *priv, int sta_id,

					u8 tid, int txq_id);

#else

static inline void iwl4965_init_ht_hw_capab(struct ieee80211_ht_info *ht_info,
@@ -966,7 +966,7 @@ enum { 


#endif



struct iwl4965_priv {

struct iwl_priv {



	/* ieee device used by generic ieee processing code */

	struct ieee80211_hw *hw;
@@ -982,7 +982,7 @@ struct iwl4965_priv { 
	int alloc_rxb_skb;

	bool add_radiotap;



	void (*rx_handlers[REPLY_MAX])(struct iwl4965_priv *priv,

	void (*rx_handlers[REPLY_MAX])(struct iwl_priv *priv,

				       struct iwl4965_rx_mem_buffer *rxb);



	struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
@@ -1214,9 +1214,9 @@ struct iwl4965_priv { 
#endif

	struct work_struct statistics_work;

	struct timer_list statistics_periodic;

}; /*iwl4965_priv */

}; /*iwl_priv */



static inline int iwl4965_is_associated(struct iwl4965_priv *priv)

static inline int iwl4965_is_associated(struct iwl_priv *priv)

{

	return (priv->active_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;

}
@@ -1259,9 +1259,9 @@ static inline int is_channel_ibss(const struct iwl4965_channel_info *ch) 
}



extern const struct iwl4965_channel_info *iwl4965_get_channel_info(

	const struct iwl4965_priv *priv, enum ieee80211_band band, u16 channel);

	const struct iwl_priv *priv, enum ieee80211_band band, u16 channel);



/* Requires full declaration of iwl4965_priv before including */

/* Requires full declaration of iwl_priv before including */

#include "iwl-4965-io.h"



#endif				/* __iwl4965_4965_h__ */

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

+5 −5
Original line number Diff line number Diff line
@@ -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);

	if ((gp & CSR_EEPROM_GP_VALID_MSK) == CSR_EEPROM_GP_BAD_SIGNATURE) {
@@ -98,7 +98,7 @@ EXPORT_SYMBOL(iwlcore_eeprom_verify_signature); 
 * EEPROM chip, not a single event, so even reads could conflict if they

 * 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;

	int ret;
@@ -124,7 +124,7 @@ int iwlcore_eeprom_acquire_semaphore(struct iwl4965_priv *priv) 
}

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,

		CSR_HW_IF_CONFIG_REG_BIT_EEPROM_OWN_SEM);
@@ -140,7 +140,7 @@ EXPORT_SYMBOL(iwlcore_eeprom_release_semaphore); 
 *

 * 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;

	u32 gp = iwl4965_read32(priv, CSR_EEPROM_GP);
@@ -197,7 +197,7 @@ int iwl_eeprom_init(struct iwl4965_priv *priv) 
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);

}