Commit 4a8a4322 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by John W. Linville
Browse files

iwl3945: replaces iwl3945_priv with iwl_priv 



The patch replaces iwl3945_priv to iwl_priv. It adds 3945 specific
data members to iwl_priv.

Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f2c7e521

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

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


#define _iwl3945_write32(priv, ofs, val) iowrite32((val), (priv)->hw_base + (ofs))

#ifdef CONFIG_IWL3945_DEBUG

static inline void __iwl3945_write32(const char *f, u32 l, struct iwl3945_priv *priv,

static inline void __iwl3945_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 __iwl3945_write32(const char *f, u32 l, struct iwl3945_priv * 


#define _iwl3945_read32(priv, ofs) ioread32((priv)->hw_base + (ofs))

#ifdef CONFIG_IWL3945_DEBUG

static inline u32 __iwl3945_read32(char *f, u32 l, struct iwl3945_priv *priv, u32 ofs)

static inline u32 __iwl3945_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 _iwl3945_read32(priv, ofs);
@@ -85,7 +85,7 @@ static inline u32 __iwl3945_read32(char *f, u32 l, struct iwl3945_priv *priv, u3 
#define iwl3945_read32(p, o) _iwl3945_read32(p, o)

#endif



static inline int _iwl3945_poll_bit(struct iwl3945_priv *priv, u32 addr,

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

				u32 bits, u32 mask, int timeout)

{

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

#ifdef CONFIG_IWL3945_DEBUG

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

				 struct iwl3945_priv *priv, u32 addr,

				 struct iwl_priv *priv, u32 addr,

				 u32 bits, u32 mask, int timeout)

{

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

#endif



static inline void _iwl3945_set_bit(struct iwl3945_priv *priv, u32 reg, u32 mask)

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

{

	_iwl3945_write32(priv, reg, _iwl3945_read32(priv, reg) | mask);

}

#ifdef CONFIG_IWL3945_DEBUG

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

				 struct iwl3945_priv *priv, u32 reg, u32 mask)

				 struct iwl_priv *priv, u32 reg, u32 mask)

{

	u32 val = _iwl3945_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 __iwl3945_set_bit(const char *f, u32 l, 
#define iwl3945_set_bit(p, r, m) _iwl3945_set_bit(p, r, m)

#endif



static inline void _iwl3945_clear_bit(struct iwl3945_priv *priv, u32 reg, u32 mask)

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

{

	_iwl3945_write32(priv, reg, _iwl3945_read32(priv, reg) & ~mask);

}

#ifdef CONFIG_IWL3945_DEBUG

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

				   struct iwl3945_priv *priv, u32 reg, u32 mask)

				   struct iwl_priv *priv, u32 reg, u32 mask)

{

	u32 val = _iwl3945_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 __iwl3945_clear_bit(const char *f, u32 l, 
#define iwl3945_clear_bit(p, r, m) _iwl3945_clear_bit(p, r, m)

#endif



static inline int _iwl3945_grab_nic_access(struct iwl3945_priv *priv)

static inline int _iwl3945_grab_nic_access(struct iwl_priv *priv)

{

	int ret;

#ifdef CONFIG_IWL3945_DEBUG
@@ -176,7 +176,7 @@ static inline int _iwl3945_grab_nic_access(struct iwl3945_priv *priv) 


#ifdef CONFIG_IWL3945_DEBUG

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

					       struct iwl3945_priv *priv)

					       struct iwl_priv *priv)

{

	if (atomic_read(&priv->restrict_refcnt))

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

#endif



static inline void _iwl3945_release_nic_access(struct iwl3945_priv *priv)

static inline void _iwl3945_release_nic_access(struct iwl_priv *priv)

{

#ifdef CONFIG_IWL3945_DEBUG

	if (atomic_dec_and_test(&priv->restrict_refcnt))
@@ -202,7 +202,7 @@ static inline void _iwl3945_release_nic_access(struct iwl3945_priv *priv) 
}

#ifdef CONFIG_IWL3945_DEBUG

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

					    struct iwl3945_priv *priv)

					    struct iwl_priv *priv)

{

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

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

#endif



static inline u32 _iwl3945_read_direct32(struct iwl3945_priv *priv, u32 reg)

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

{

	return _iwl3945_read32(priv, reg);

}

#ifdef CONFIG_IWL3945_DEBUG

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

					struct iwl3945_priv *priv, u32 reg)

					struct iwl_priv *priv, u32 reg)

{

	u32 value = _iwl3945_read_direct32(priv, reg);

	if (!atomic_read(&priv->restrict_refcnt))
@@ -238,14 +238,14 @@ static inline u32 __iwl3945_read_direct32(const char *f, u32 l, 
#define iwl3945_read_direct32 _iwl3945_read_direct32

#endif



static inline void _iwl3945_write_direct32(struct iwl3945_priv *priv,

static inline void _iwl3945_write_direct32(struct iwl_priv *priv,

					 u32 reg, u32 value)

{

	_iwl3945_write32(priv, reg, value);

}

#ifdef CONFIG_IWL3945_DEBUG

static void __iwl3945_write_direct32(u32 line,

				   struct iwl3945_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);
@@ -257,7 +257,7 @@ static void __iwl3945_write_direct32(u32 line, 
#define iwl3945_write_direct32 _iwl3945_write_direct32

#endif



static inline void iwl3945_write_reg_buf(struct iwl3945_priv *priv,

static inline void iwl3945_write_reg_buf(struct iwl_priv *priv,

					       u32 reg, u32 len, u32 *values)

{

	u32 count = sizeof(u32);
@@ -268,7 +268,7 @@ static inline void iwl3945_write_reg_buf(struct iwl3945_priv *priv, 
	}

}



static inline int _iwl3945_poll_direct_bit(struct iwl3945_priv *priv,

static inline int _iwl3945_poll_direct_bit(struct iwl_priv *priv,

					   u32 addr, u32 mask, int timeout)

{

	return _iwl3945_poll_bit(priv, addr, mask, mask, timeout);
@@ -276,7 +276,7 @@ static inline int _iwl3945_poll_direct_bit(struct iwl3945_priv *priv, 


#ifdef CONFIG_IWL3945_DEBUG

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

					    struct iwl3945_priv *priv,

					    struct iwl_priv *priv,

					    u32 addr, u32 mask, int timeout)

{

	int ret  = _iwl3945_poll_direct_bit(priv, addr, mask, timeout);
@@ -295,14 +295,14 @@ static inline int __iwl3945_poll_direct_bit(const char *f, u32 l, 
#define iwl3945_poll_direct_bit _iwl3945_poll_direct_bit

#endif



static inline u32 _iwl3945_read_prph(struct iwl3945_priv *priv, u32 reg)

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

{

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

	rmb();

	return _iwl3945_read_direct32(priv, HBUS_TARG_PRPH_RDAT);

}

#ifdef CONFIG_IWL3945_DEBUG

static inline u32 __iwl3945_read_prph(u32 line, struct iwl3945_priv *priv, u32 reg)

static inline u32 __iwl3945_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);
@@ -315,7 +315,7 @@ static inline u32 __iwl3945_read_prph(u32 line, struct iwl3945_priv *priv, u32 r 
#define iwl3945_read_prph _iwl3945_read_prph

#endif



static inline void _iwl3945_write_prph(struct iwl3945_priv *priv,

static inline void _iwl3945_write_prph(struct iwl_priv *priv,

					     u32 addr, u32 val)

{

	_iwl3945_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
@@ -324,7 +324,7 @@ static inline void _iwl3945_write_prph(struct iwl3945_priv *priv, 
	_iwl3945_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);

}

#ifdef CONFIG_IWL3945_DEBUG

static inline void __iwl3945_write_prph(u32 line, struct iwl3945_priv *priv,

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

					      u32 addr, u32 val)

{

	if (!atomic_read(&priv->restrict_refcnt))
@@ -341,7 +341,7 @@ static inline void __iwl3945_write_prph(u32 line, struct iwl3945_priv *priv, 
#define _iwl3945_set_bits_prph(priv, reg, mask) \

	_iwl3945_write_prph(priv, reg, (_iwl3945_read_prph(priv, reg) | mask))

#ifdef CONFIG_IWL3945_DEBUG

static inline void __iwl3945_set_bits_prph(u32 line, struct iwl3945_priv *priv,

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

					u32 reg, u32 mask)

{

	if (!atomic_read(&priv->restrict_refcnt))
@@ -360,7 +360,7 @@ static inline void __iwl3945_set_bits_prph(u32 line, struct iwl3945_priv *priv, 


#ifdef CONFIG_IWL3945_DEBUG

static inline void __iwl3945_set_bits_mask_prph(u32 line,

		struct iwl3945_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);
@@ -372,28 +372,28 @@ static inline void __iwl3945_set_bits_mask_prph(u32 line, 
#define iwl3945_set_bits_mask_prph _iwl3945_set_bits_mask_prph

#endif



static inline void iwl3945_clear_bits_prph(struct iwl3945_priv

static inline void iwl3945_clear_bits_prph(struct iwl_priv

						 *priv, u32 reg, u32 mask)

{

	u32 val = _iwl3945_read_prph(priv, reg);

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

}



static inline u32 iwl3945_read_targ_mem(struct iwl3945_priv *priv, u32 addr)

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

{

	iwl3945_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);

	rmb();

	return iwl3945_read_direct32(priv, HBUS_TARG_MEM_RDAT);

}



static inline void iwl3945_write_targ_mem(struct iwl3945_priv *priv, u32 addr, u32 val)

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

{

	iwl3945_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);

	wmb();

	iwl3945_write_direct32(priv, HBUS_TARG_MEM_WDAT, val);

}



static inline void iwl3945_write_targ_mem_buf(struct iwl3945_priv *priv, u32 addr,

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

					  u32 len, u32 *values)

{

	iwl3945_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);

drivers/net/wireless/iwlwifi/iwl-3945-led.c

+13 −13
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ static const struct { 
#define IWL_MAX_BLINK_TBL (ARRAY_SIZE(blink_tbl) - 1) /*Exclude Solid on*/

#define IWL_SOLID_BLINK_IDX (ARRAY_SIZE(blink_tbl) - 1)



static int iwl3945_led_cmd_callback(struct iwl3945_priv *priv,

static int iwl3945_led_cmd_callback(struct iwl_priv *priv,

				    struct iwl3945_cmd *cmd,

				    struct sk_buff *skb)

{
@@ -80,7 +80,7 @@ static inline int iwl3945_brightness_to_idx(enum led_brightness brightness) 
}



/* Send led command */

static int iwl_send_led_cmd(struct iwl3945_priv *priv,

static int iwl_send_led_cmd(struct iwl_priv *priv,

			    struct iwl_led_cmd *led_cmd)

{

	struct iwl3945_host_cmd cmd = {
@@ -97,7 +97,7 @@ static int iwl_send_led_cmd(struct iwl3945_priv *priv, 




/* Set led on command */

static int iwl3945_led_pattern(struct iwl3945_priv *priv, int led_id,

static int iwl3945_led_pattern(struct iwl_priv *priv, int led_id,

			       unsigned int idx)

{

	struct iwl_led_cmd led_cmd = {
@@ -115,7 +115,7 @@ static int iwl3945_led_pattern(struct iwl3945_priv *priv, int led_id, 




/* Set led on command */

static int iwl3945_led_on(struct iwl3945_priv *priv, int led_id)

static int iwl3945_led_on(struct iwl_priv *priv, int led_id)

{

	struct iwl_led_cmd led_cmd = {

		.id = led_id,
@@ -127,7 +127,7 @@ static int iwl3945_led_on(struct iwl3945_priv *priv, int led_id) 
}



/* Set led off command */

static int iwl3945_led_off(struct iwl3945_priv *priv, int led_id)

static int iwl3945_led_off(struct iwl_priv *priv, int led_id)

{

	struct iwl_led_cmd led_cmd = {

		.id = led_id,
@@ -142,7 +142,7 @@ static int iwl3945_led_off(struct iwl3945_priv *priv, int led_id) 
/*

 * brightness call back function for Tx/Rx LED

 */

static int iwl3945_led_associated(struct iwl3945_priv *priv, int led_id)

static int iwl3945_led_associated(struct iwl_priv *priv, int led_id)

{

	if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||

	    !test_bit(STATUS_READY, &priv->status))
@@ -163,7 +163,7 @@ static void iwl3945_led_brightness_set(struct led_classdev *led_cdev, 
{

	struct iwl3945_led *led = container_of(led_cdev,

					       struct iwl3945_led, led_dev);

	struct iwl3945_priv *priv = led->priv;

	struct iwl_priv *priv = led->priv;



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return;
@@ -199,7 +199,7 @@ static void iwl3945_led_brightness_set(struct led_classdev *led_cdev, 
/*

 * Register led class with the system

 */

static int iwl3945_led_register_led(struct iwl3945_priv *priv,

static int iwl3945_led_register_led(struct iwl_priv *priv,

				   struct iwl3945_led *led,

				   enum led_type type, u8 set_led,

				   char *trigger)
@@ -231,7 +231,7 @@ static int iwl3945_led_register_led(struct iwl3945_priv *priv, 
/*

 * calculate blink rate according to last 2 sec Tx/Rx activities

 */

static inline u8 get_blink_rate(struct iwl3945_priv *priv)

static inline u8 get_blink_rate(struct iwl_priv *priv)

{

	int index;

	u64 current_tpt = priv->rxtxpackets;
@@ -250,7 +250,7 @@ static inline u8 get_blink_rate(struct iwl3945_priv *priv) 
	return index;

}



static inline int is_rf_kill(struct iwl3945_priv *priv)

static inline int is_rf_kill(struct iwl_priv *priv)

{

	return test_bit(STATUS_RF_KILL_HW, &priv->status) ||

		test_bit(STATUS_RF_KILL_SW, &priv->status);
@@ -261,7 +261,7 @@ static inline int is_rf_kill(struct iwl3945_priv *priv) 
 * happen very frequent we postpone led command to be called from

 * REPLY handler so we know ucode is up

 */

void iwl3945_led_background(struct iwl3945_priv *priv)

void iwl3945_led_background(struct iwl_priv *priv)

{

	u8 blink_idx;
@@ -301,7 +301,7 @@ void iwl3945_led_background(struct iwl3945_priv *priv) 




/* Register all led handler */

int iwl3945_led_register(struct iwl3945_priv *priv)

int iwl3945_led_register(struct iwl_priv *priv)

{

	char *trigger;

	int ret;
@@ -399,7 +399,7 @@ static void iwl3945_led_unregister_led(struct iwl3945_led *led, u8 set_led) 
}



/* Unregister all led handlers */

void iwl3945_led_unregister(struct iwl3945_priv *priv)

void iwl3945_led_unregister(struct iwl_priv *priv)

{

	iwl3945_led_unregister_led(&priv->led39[IWL_LED_TRG_ASSOC], 0);

	iwl3945_led_unregister_led(&priv->led39[IWL_LED_TRG_RX], 0);

drivers/net/wireless/iwlwifi/iwl-3945-led.h

+11 −11
Original line number Diff line number Diff line
@@ -27,34 +27,34 @@ 
#ifndef IWL3945_LEDS_H

#define IWL3945_LEDS_H



struct iwl3945_priv;

struct iwl_priv;



#ifdef CONFIG_IWL3945_LEDS



#include "iwl-led.h"



struct iwl3945_led {

	struct iwl3945_priv *priv;

	struct iwl_priv *priv;

	struct led_classdev led_dev;

	char name[32];



	int (*led_on) (struct iwl3945_priv *priv, int led_id);

	int (*led_off) (struct iwl3945_priv *priv, int led_id);

	int (*led_pattern) (struct iwl3945_priv *priv, int led_id,

	int (*led_on) (struct iwl_priv *priv, int led_id);

	int (*led_off) (struct iwl_priv *priv, int led_id);

	int (*led_pattern) (struct iwl_priv *priv, int led_id,

			    unsigned int idx);



	enum led_type type;

	unsigned int registered;

};



extern int iwl3945_led_register(struct iwl3945_priv *priv);

extern void iwl3945_led_unregister(struct iwl3945_priv *priv);

extern void iwl3945_led_background(struct iwl3945_priv *priv);

extern int iwl3945_led_register(struct iwl_priv *priv);

extern void iwl3945_led_unregister(struct iwl_priv *priv);

extern void iwl3945_led_background(struct iwl_priv *priv);



#else

static inline int iwl3945_led_register(struct iwl3945_priv *priv) { return 0; }

static inline void iwl3945_led_unregister(struct iwl3945_priv *priv) {}

static inline void iwl3945_led_background(struct iwl3945_priv *priv) {}

static inline int iwl3945_led_register(struct iwl_priv *priv) { return 0; }

static inline void iwl3945_led_unregister(struct iwl_priv *priv) {}

static inline void iwl3945_led_background(struct iwl_priv *priv) {}

#endif /* CONFIG_IWL3945_LEDS */



#endif /* IWL3945_LEDS_H */

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

+12 −12
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ struct iwl3945_rate_scale_data { 


struct iwl3945_rs_sta {

	spinlock_t lock;

	struct iwl3945_priv *priv;

	struct iwl_priv *priv;

	s32 *expected_tpt;

	unsigned long last_partial_flush;

	unsigned long last_flush;
@@ -183,7 +183,7 @@ static int iwl3945_rate_scale_flush_windows(struct iwl3945_rs_sta *rs_sta) 
	int unflushed = 0;

	int i;

	unsigned long flags;

	struct iwl3945_priv *priv = rs_sta->priv;

	struct iwl_priv *priv = rs_sta->priv;



	/*

	 * For each rate, if we have collected data on that rate
@@ -216,7 +216,7 @@ static int iwl3945_rate_scale_flush_windows(struct iwl3945_rs_sta *rs_sta) 
static void iwl3945_bg_rate_scale_flush(unsigned long data)

{

	struct iwl3945_rs_sta *rs_sta = (void *)data;

	struct iwl3945_priv *priv = rs_sta->priv;

	struct iwl_priv *priv = rs_sta->priv;

	int unflushed = 0;

	unsigned long flags;

	u32 packet_count, duration, pps;
@@ -290,7 +290,7 @@ static void iwl3945_collect_tx_data(struct iwl3945_rs_sta *rs_sta, 
{

	unsigned long flags;

	s32 fail_count;

	struct iwl3945_priv *priv = rs_sta->priv;

	struct iwl_priv *priv = rs_sta->priv;



	if (!retries) {

		IWL_DEBUG_RATE("leave: retries == 0 -- should be at least 1\n");
@@ -344,7 +344,7 @@ static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband, 
			 struct ieee80211_sta *sta, void *priv_sta)

{

	struct iwl3945_rs_sta *rs_sta = priv_sta;

	struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_r;

	struct iwl_priv *priv = (struct iwl_priv *)priv_r;

	int i;



	IWL_DEBUG_RATE("enter\n");
@@ -388,7 +388,7 @@ static void *rs_alloc_sta(void *iwl_priv, struct ieee80211_sta *sta, gfp_t gfp) 
{

	struct iwl3945_rs_sta *rs_sta;

	struct iwl3945_sta_priv *psta = (void *) sta->drv_priv;

	struct iwl3945_priv *priv = iwl_priv;

	struct iwl_priv *priv = iwl_priv;

	int i;



	/*
@@ -438,7 +438,7 @@ static void rs_free_sta(void *iwl_priv, struct ieee80211_sta *sta, 
{

	struct iwl3945_sta_priv *psta = (void *) sta->drv_priv;

	struct iwl3945_rs_sta *rs_sta = priv_sta;

	struct iwl3945_priv *priv = rs_sta->priv;

	struct iwl_priv *priv = rs_sta->priv;



	psta->rs_sta = NULL;
@@ -452,7 +452,7 @@ static void rs_free_sta(void *iwl_priv, struct ieee80211_sta *sta, 
/**

 * rs_tx_status - Update rate control values based on Tx results

 *

 * NOTE: Uses iwl3945_priv->retry_rate for the # of retries attempted by

 * NOTE: Uses iwl_priv->retry_rate for the # of retries attempted by

 * the hardware for each rate.

 */

static void rs_tx_status(void *priv_rate, struct ieee80211_supported_band *sband,
@@ -462,7 +462,7 @@ static void rs_tx_status(void *priv_rate, struct ieee80211_supported_band *sband 
	s8 retries = 0, current_count;

	int scale_rate_index, first_index, last_index;

	unsigned long flags;

	struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_rate;

	struct iwl_priv *priv = (struct iwl_priv *)priv_rate;

	struct iwl3945_rs_sta *rs_sta = priv_sta;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
@@ -556,7 +556,7 @@ static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta, 
{

	u8 high = IWL_RATE_INVALID;

	u8 low = IWL_RATE_INVALID;

	struct iwl3945_priv *priv = rs_sta->priv;

	struct iwl_priv *priv = rs_sta->priv;



	/* 802.11A walks to the next literal adjacent rate in

	 * the rate table */
@@ -651,7 +651,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, 
	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;

	u16 fc;

	u16 rate_mask = 0;

	struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_r;

	struct iwl_priv *priv = (struct iwl_priv *)priv_r;

	struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);



	IWL_DEBUG_RATE("enter\n");
@@ -890,7 +890,7 @@ static struct rate_control_ops rs_ops = { 


void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id)

{

	struct iwl3945_priv *priv = hw->priv;

	struct iwl_priv *priv = hw->priv;

	s32 rssi = 0;

	unsigned long flags;

	struct iwl3945_rs_sta *rs_sta;

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

+49 −49

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE