Skip to content

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

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
Show whitespace changes
Inline Side-by-side
Showing with 417 additions and 595 deletions
drivers/net/wireless/iwlwifi/iwl-3945-io.h
View file @ 4a8a4322
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
#define _iwl3945_write32(priv, ofs, val) iowrite32((val), (priv)->hw_base + (ofs)) #define _iwl3945_write32(priv, ofs, val) iowrite32((val), (priv)->hw_base + (ofs))
#ifdef CONFIG_IWL3945_DEBUG #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) u32 ofs, u32 val)
{ {
IWL_DEBUG_IO("write32(0x%08X, 0x%08X) - %s %d\n", ofs, val, f, l); 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 * ...@@ -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)) #define _iwl3945_read32(priv, ofs) ioread32((priv)->hw_base + (ofs))
#ifdef CONFIG_IWL3945_DEBUG #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); IWL_DEBUG_IO("read_direct32(0x%08X) - %s %d\n", ofs, f, l);
return _iwl3945_read32(priv, ofs); return _iwl3945_read32(priv, ofs);
...@@ -85,7 +85,7 @@ static inline u32 __iwl3945_read32(char *f, u32 l, struct iwl3945_priv *priv, u3 ...@@ -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) #define iwl3945_read32(p, o) _iwl3945_read32(p, o)
#endif #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) u32 bits, u32 mask, int timeout)
{ {
int i = 0; int i = 0;
...@@ -101,7 +101,7 @@ static inline int _iwl3945_poll_bit(struct iwl3945_priv *priv, u32 addr, ...@@ -101,7 +101,7 @@ static inline int _iwl3945_poll_bit(struct iwl3945_priv *priv, u32 addr,
} }
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline int __iwl3945_poll_bit(const char *f, u32 l, 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) u32 bits, u32 mask, int timeout)
{ {
int ret = _iwl3945_poll_bit(priv, addr, bits, mask, 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, ...@@ -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) #define iwl3945_poll_bit(p, a, b, m, t) _iwl3945_poll_bit(p, a, b, m, t)
#endif #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); _iwl3945_write32(priv, reg, _iwl3945_read32(priv, reg) | mask);
} }
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl3945_set_bit(const char *f, u32 l, 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; u32 val = _iwl3945_read32(priv, reg) | mask;
IWL_DEBUG_IO("set_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val); 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, ...@@ -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) #define iwl3945_set_bit(p, r, m) _iwl3945_set_bit(p, r, m)
#endif #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); _iwl3945_write32(priv, reg, _iwl3945_read32(priv, reg) & ~mask);
} }
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl3945_clear_bit(const char *f, u32 l, 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; u32 val = _iwl3945_read32(priv, reg) & ~mask;
IWL_DEBUG_IO("clear_bit(0x%08X, 0x%08X) = 0x%08X\n", reg, mask, val); 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, ...@@ -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) #define iwl3945_clear_bit(p, r, m) _iwl3945_clear_bit(p, r, m)
#endif #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; int ret;
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
...@@ -176,7 +176,7 @@ static inline int _iwl3945_grab_nic_access(struct iwl3945_priv *priv) ...@@ -176,7 +176,7 @@ static inline int _iwl3945_grab_nic_access(struct iwl3945_priv *priv)
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline int __iwl3945_grab_nic_access(const char *f, u32 l, 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)) if (atomic_read(&priv->restrict_refcnt))
IWL_DEBUG_INFO("Grabbing access while already held at " 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, ...@@ -192,7 +192,7 @@ static inline int __iwl3945_grab_nic_access(const char *f, u32 l,
_iwl3945_grab_nic_access(priv) _iwl3945_grab_nic_access(priv)
#endif #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 #ifdef CONFIG_IWL3945_DEBUG
if (atomic_dec_and_test(&priv->restrict_refcnt)) if (atomic_dec_and_test(&priv->restrict_refcnt))
...@@ -202,7 +202,7 @@ static inline void _iwl3945_release_nic_access(struct iwl3945_priv *priv) ...@@ -202,7 +202,7 @@ static inline void _iwl3945_release_nic_access(struct iwl3945_priv *priv)
} }
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl3945_release_nic_access(const char *f, u32 l, 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) if (atomic_read(&priv->restrict_refcnt) <= 0)
IWL_ERROR("Release unheld nic access at line %d.\n", l); 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, ...@@ -217,13 +217,13 @@ static inline void __iwl3945_release_nic_access(const char *f, u32 l,
_iwl3945_release_nic_access(priv) _iwl3945_release_nic_access(priv)
#endif #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); return _iwl3945_read32(priv, reg);
} }
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline u32 __iwl3945_read_direct32(const char *f, u32 l, 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); u32 value = _iwl3945_read_direct32(priv, reg);
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
...@@ -238,14 +238,14 @@ static inline u32 __iwl3945_read_direct32(const char *f, u32 l, ...@@ -238,14 +238,14 @@ static inline u32 __iwl3945_read_direct32(const char *f, u32 l,
#define iwl3945_read_direct32 _iwl3945_read_direct32 #define iwl3945_read_direct32 _iwl3945_read_direct32
#endif #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) u32 reg, u32 value)
{ {
_iwl3945_write32(priv, reg, value); _iwl3945_write32(priv, reg, value);
} }
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static void __iwl3945_write_direct32(u32 line, 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)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from line %d\n", line); IWL_ERROR("Nic access not held from line %d\n", line);
...@@ -257,7 +257,7 @@ static void __iwl3945_write_direct32(u32 line, ...@@ -257,7 +257,7 @@ static void __iwl3945_write_direct32(u32 line,
#define iwl3945_write_direct32 _iwl3945_write_direct32 #define iwl3945_write_direct32 _iwl3945_write_direct32
#endif #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 reg, u32 len, u32 *values)
{ {
u32 count = sizeof(u32); u32 count = sizeof(u32);
...@@ -268,7 +268,7 @@ static inline void iwl3945_write_reg_buf(struct iwl3945_priv *priv, ...@@ -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) u32 addr, u32 mask, int timeout)
{ {
return _iwl3945_poll_bit(priv, addr, mask, mask, 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, ...@@ -276,7 +276,7 @@ static inline int _iwl3945_poll_direct_bit(struct iwl3945_priv *priv,
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline int __iwl3945_poll_direct_bit(const char *f, u32 l, 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) u32 addr, u32 mask, int timeout)
{ {
int ret = _iwl3945_poll_direct_bit(priv, addr, mask, 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, ...@@ -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 #define iwl3945_poll_direct_bit _iwl3945_poll_direct_bit
#endif #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)); _iwl3945_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
rmb(); rmb();
return _iwl3945_read_direct32(priv, HBUS_TARG_PRPH_RDAT); return _iwl3945_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
} }
#ifdef CONFIG_IWL3945_DEBUG #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)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from line %d\n", line); 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 ...@@ -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 #define iwl3945_read_prph _iwl3945_read_prph
#endif #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) u32 addr, u32 val)
{ {
_iwl3945_write_direct32(priv, HBUS_TARG_PRPH_WADDR, _iwl3945_write_direct32(priv, HBUS_TARG_PRPH_WADDR,
...@@ -324,7 +324,7 @@ static inline void _iwl3945_write_prph(struct iwl3945_priv *priv, ...@@ -324,7 +324,7 @@ static inline void _iwl3945_write_prph(struct iwl3945_priv *priv,
_iwl3945_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val); _iwl3945_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
} }
#ifdef CONFIG_IWL3945_DEBUG #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) u32 addr, u32 val)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
...@@ -341,7 +341,7 @@ static inline void __iwl3945_write_prph(u32 line, struct iwl3945_priv *priv, ...@@ -341,7 +341,7 @@ static inline void __iwl3945_write_prph(u32 line, struct iwl3945_priv *priv,
#define _iwl3945_set_bits_prph(priv, reg, mask) \ #define _iwl3945_set_bits_prph(priv, reg, mask) \
_iwl3945_write_prph(priv, reg, (_iwl3945_read_prph(priv, reg) | mask)) _iwl3945_write_prph(priv, reg, (_iwl3945_read_prph(priv, reg) | mask))
#ifdef CONFIG_IWL3945_DEBUG #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) u32 reg, u32 mask)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
...@@ -360,7 +360,7 @@ static inline void __iwl3945_set_bits_prph(u32 line, struct iwl3945_priv *priv, ...@@ -360,7 +360,7 @@ static inline void __iwl3945_set_bits_prph(u32 line, struct iwl3945_priv *priv,
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl3945_set_bits_mask_prph(u32 line, 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)) if (!atomic_read(&priv->restrict_refcnt))
IWL_ERROR("Nic access not held from line %d\n", line); 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, ...@@ -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 #define iwl3945_set_bits_mask_prph _iwl3945_set_bits_mask_prph
#endif #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) *priv, u32 reg, u32 mask)
{ {
u32 val = _iwl3945_read_prph(priv, reg); u32 val = _iwl3945_read_prph(priv, reg);
_iwl3945_write_prph(priv, reg, (val & ~mask)); _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); iwl3945_write_direct32(priv, HBUS_TARG_MEM_RADDR, addr);
rmb(); rmb();
return iwl3945_read_direct32(priv, HBUS_TARG_MEM_RDAT); 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); iwl3945_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
wmb(); wmb();
iwl3945_write_direct32(priv, HBUS_TARG_MEM_WDAT, val); 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) u32 len, u32 *values)
{ {
iwl3945_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr); iwl3945_write_direct32(priv, HBUS_TARG_MEM_WADDR, addr);
......
drivers/net/wireless/iwlwifi/iwl-3945-led.c
View file @ 4a8a4322
...@@ -67,7 +67,7 @@ static const struct { ...@@ -67,7 +67,7 @@ static const struct {
#define IWL_MAX_BLINK_TBL (ARRAY_SIZE(blink_tbl) - 1) /*Exclude Solid on*/ #define IWL_MAX_BLINK_TBL (ARRAY_SIZE(blink_tbl) - 1) /*Exclude Solid on*/
#define IWL_SOLID_BLINK_IDX (ARRAY_SIZE(blink_tbl) - 1) #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 iwl3945_cmd *cmd,
struct sk_buff *skb) struct sk_buff *skb)
{ {
...@@ -80,7 +80,7 @@ static inline int iwl3945_brightness_to_idx(enum led_brightness brightness) ...@@ -80,7 +80,7 @@ static inline int iwl3945_brightness_to_idx(enum led_brightness brightness)
} }
/* Send led command */ /* 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 iwl_led_cmd *led_cmd)
{ {
struct iwl3945_host_cmd cmd = { struct iwl3945_host_cmd cmd = {
...@@ -97,7 +97,7 @@ static int iwl_send_led_cmd(struct iwl3945_priv *priv, ...@@ -97,7 +97,7 @@ static int iwl_send_led_cmd(struct iwl3945_priv *priv,
/* Set led on command */ /* 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) unsigned int idx)
{ {
struct iwl_led_cmd led_cmd = { struct iwl_led_cmd led_cmd = {
...@@ -115,7 +115,7 @@ static int iwl3945_led_pattern(struct iwl3945_priv *priv, int led_id, ...@@ -115,7 +115,7 @@ static int iwl3945_led_pattern(struct iwl3945_priv *priv, int led_id,
/* Set led on command */ /* 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 = { struct iwl_led_cmd led_cmd = {
.id = led_id, .id = led_id,
...@@ -127,7 +127,7 @@ static int iwl3945_led_on(struct iwl3945_priv *priv, int led_id) ...@@ -127,7 +127,7 @@ static int iwl3945_led_on(struct iwl3945_priv *priv, int led_id)
} }
/* Set led off command */ /* 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 = { struct iwl_led_cmd led_cmd = {
.id = led_id, .id = led_id,
...@@ -142,7 +142,7 @@ static int iwl3945_led_off(struct iwl3945_priv *priv, int 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 * 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) || if (test_bit(STATUS_EXIT_PENDING, &priv->status) ||
!test_bit(STATUS_READY, &priv->status)) !test_bit(STATUS_READY, &priv->status))
...@@ -163,7 +163,7 @@ static void iwl3945_led_brightness_set(struct led_classdev *led_cdev, ...@@ -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 = container_of(led_cdev,
struct iwl3945_led, led_dev); 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)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;
...@@ -199,7 +199,7 @@ static void iwl3945_led_brightness_set(struct led_classdev *led_cdev, ...@@ -199,7 +199,7 @@ static void iwl3945_led_brightness_set(struct led_classdev *led_cdev,
/* /*
* Register led class with the system * 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, struct iwl3945_led *led,
enum led_type type, u8 set_led, enum led_type type, u8 set_led,
char *trigger) char *trigger)
...@@ -231,7 +231,7 @@ static int iwl3945_led_register_led(struct iwl3945_priv *priv, ...@@ -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 * 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; int index;
u64 current_tpt = priv->rxtxpackets; u64 current_tpt = priv->rxtxpackets;
...@@ -250,7 +250,7 @@ static inline u8 get_blink_rate(struct iwl3945_priv *priv) ...@@ -250,7 +250,7 @@ static inline u8 get_blink_rate(struct iwl3945_priv *priv)
return index; 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) || return test_bit(STATUS_RF_KILL_HW, &priv->status) ||
test_bit(STATUS_RF_KILL_SW, &priv->status); test_bit(STATUS_RF_KILL_SW, &priv->status);
...@@ -261,7 +261,7 @@ static inline int is_rf_kill(struct iwl3945_priv *priv) ...@@ -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 * happen very frequent we postpone led command to be called from
* REPLY handler so we know ucode is up * 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; u8 blink_idx;
...@@ -301,7 +301,7 @@ void iwl3945_led_background(struct iwl3945_priv *priv) ...@@ -301,7 +301,7 @@ void iwl3945_led_background(struct iwl3945_priv *priv)
/* Register all led handler */ /* Register all led handler */
int iwl3945_led_register(struct iwl3945_priv *priv) int iwl3945_led_register(struct iwl_priv *priv)
{ {
char *trigger; char *trigger;
int ret; int ret;
...@@ -399,7 +399,7 @@ static void iwl3945_led_unregister_led(struct iwl3945_led *led, u8 set_led) ...@@ -399,7 +399,7 @@ static void iwl3945_led_unregister_led(struct iwl3945_led *led, u8 set_led)
} }
/* Unregister all led handlers */ /* 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_ASSOC], 0);
iwl3945_led_unregister_led(&priv->led39[IWL_LED_TRG_RX], 0); iwl3945_led_unregister_led(&priv->led39[IWL_LED_TRG_RX], 0);
......
drivers/net/wireless/iwlwifi/iwl-3945-led.h
View file @ 4a8a4322
...@@ -27,34 +27,34 @@ ...@@ -27,34 +27,34 @@
#ifndef IWL3945_LEDS_H #ifndef IWL3945_LEDS_H
#define IWL3945_LEDS_H #define IWL3945_LEDS_H
struct iwl3945_priv; struct iwl_priv;
#ifdef CONFIG_IWL3945_LEDS #ifdef CONFIG_IWL3945_LEDS
#include "iwl-led.h" #include "iwl-led.h"
struct iwl3945_led { struct iwl3945_led {
struct iwl3945_priv *priv; struct iwl_priv *priv;
struct led_classdev led_dev; struct led_classdev led_dev;
char name[32]; char name[32];
int (*led_on) (struct iwl3945_priv *priv, int led_id); int (*led_on) (struct iwl_priv *priv, int led_id);
int (*led_off) (struct iwl3945_priv *priv, int led_id); int (*led_off) (struct iwl_priv *priv, int led_id);
int (*led_pattern) (struct iwl3945_priv *priv, int led_id, int (*led_pattern) (struct iwl_priv *priv, int led_id,
unsigned int idx); unsigned int idx);
enum led_type type; enum led_type type;
unsigned int registered; unsigned int registered;
}; };
extern int iwl3945_led_register(struct iwl3945_priv *priv); extern int iwl3945_led_register(struct iwl_priv *priv);
extern void iwl3945_led_unregister(struct iwl3945_priv *priv); extern void iwl3945_led_unregister(struct iwl_priv *priv);
extern void iwl3945_led_background(struct iwl3945_priv *priv); extern void iwl3945_led_background(struct iwl_priv *priv);
#else #else
static inline int iwl3945_led_register(struct iwl3945_priv *priv) { return 0; } static inline int iwl3945_led_register(struct iwl_priv *priv) { return 0; }
static inline void iwl3945_led_unregister(struct iwl3945_priv *priv) {} static inline void iwl3945_led_unregister(struct iwl_priv *priv) {}
static inline void iwl3945_led_background(struct iwl3945_priv *priv) {} static inline void iwl3945_led_background(struct iwl_priv *priv) {}
#endif /* CONFIG_IWL3945_LEDS */ #endif /* CONFIG_IWL3945_LEDS */
#endif /* IWL3945_LEDS_H */ #endif /* IWL3945_LEDS_H */
drivers/net/wireless/iwlwifi/iwl-3945-rs.c
View file @ 4a8a4322
...@@ -52,7 +52,7 @@ struct iwl3945_rate_scale_data { ...@@ -52,7 +52,7 @@ struct iwl3945_rate_scale_data {
struct iwl3945_rs_sta { struct iwl3945_rs_sta {
spinlock_t lock; spinlock_t lock;
struct iwl3945_priv *priv; struct iwl_priv *priv;
s32 *expected_tpt; s32 *expected_tpt;
unsigned long last_partial_flush; unsigned long last_partial_flush;
unsigned long last_flush; unsigned long last_flush;
...@@ -183,7 +183,7 @@ static int iwl3945_rate_scale_flush_windows(struct iwl3945_rs_sta *rs_sta) ...@@ -183,7 +183,7 @@ static int iwl3945_rate_scale_flush_windows(struct iwl3945_rs_sta *rs_sta)
int unflushed = 0; int unflushed = 0;
int i; int i;
unsigned long flags; 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 * 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) ...@@ -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) static void iwl3945_bg_rate_scale_flush(unsigned long data)
{ {
struct iwl3945_rs_sta *rs_sta = (void *)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; int unflushed = 0;
unsigned long flags; unsigned long flags;
u32 packet_count, duration, pps; u32 packet_count, duration, pps;
...@@ -290,7 +290,7 @@ static void iwl3945_collect_tx_data(struct iwl3945_rs_sta *rs_sta, ...@@ -290,7 +290,7 @@ static void iwl3945_collect_tx_data(struct iwl3945_rs_sta *rs_sta,
{ {
unsigned long flags; unsigned long flags;
s32 fail_count; s32 fail_count;
struct iwl3945_priv *priv = rs_sta->priv; struct iwl_priv *priv = rs_sta->priv;
if (!retries) { if (!retries) {
IWL_DEBUG_RATE("leave: retries == 0 -- should be at least 1\n"); 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, ...@@ -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 ieee80211_sta *sta, void *priv_sta)
{ {
struct iwl3945_rs_sta *rs_sta = 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; int i;
IWL_DEBUG_RATE("enter\n"); IWL_DEBUG_RATE("enter\n");
...@@ -388,7 +388,7 @@ static void *rs_alloc_sta(void *iwl_priv, struct ieee80211_sta *sta, gfp_t gfp) ...@@ -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_rs_sta *rs_sta;
struct iwl3945_sta_priv *psta = (void *) sta->drv_priv; struct iwl3945_sta_priv *psta = (void *) sta->drv_priv;
struct iwl3945_priv *priv = iwl_priv; struct iwl_priv *priv = iwl_priv;
int i; int i;
/* /*
...@@ -438,7 +438,7 @@ static void rs_free_sta(void *iwl_priv, struct ieee80211_sta *sta, ...@@ -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_sta_priv *psta = (void *) sta->drv_priv;
struct iwl3945_rs_sta *rs_sta = priv_sta; 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; psta->rs_sta = NULL;
...@@ -452,7 +452,7 @@ static void rs_free_sta(void *iwl_priv, struct ieee80211_sta *sta, ...@@ -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 * 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. * the hardware for each rate.
*/ */
static void rs_tx_status(void *priv_rate, struct ieee80211_supported_band *sband, 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 ...@@ -462,7 +462,7 @@ static void rs_tx_status(void *priv_rate, struct ieee80211_supported_band *sband
s8 retries = 0, current_count; s8 retries = 0, current_count;
int scale_rate_index, first_index, last_index; int scale_rate_index, first_index, last_index;
unsigned long flags; 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 iwl3945_rs_sta *rs_sta = priv_sta;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); 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, ...@@ -556,7 +556,7 @@ static u16 iwl3945_get_adjacent_rate(struct iwl3945_rs_sta *rs_sta,
{ {
u8 high = IWL_RATE_INVALID; u8 high = IWL_RATE_INVALID;
u8 low = 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 /* 802.11A walks to the next literal adjacent rate in
* the rate table */ * the rate table */
...@@ -651,7 +651,7 @@ static void rs_get_rate(void *priv_r, struct ieee80211_sta *sta, ...@@ -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; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
u16 fc; u16 fc;
u16 rate_mask = 0; 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); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
IWL_DEBUG_RATE("enter\n"); IWL_DEBUG_RATE("enter\n");
...@@ -890,7 +890,7 @@ static struct rate_control_ops rs_ops = { ...@@ -890,7 +890,7 @@ static struct rate_control_ops rs_ops = {
void iwl3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) 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; s32 rssi = 0;
unsigned long flags; unsigned long flags;
struct iwl3945_rs_sta *rs_sta; struct iwl3945_rs_sta *rs_sta;
......
drivers/net/wireless/iwlwifi/iwl-3945.c
View file @ 4a8a4322
...@@ -93,7 +93,7 @@ const struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT_3945] = { ...@@ -93,7 +93,7 @@ const struct iwl3945_rate_info iwl3945_rates[IWL_RATE_COUNT_3945] = {
* Use for only special debugging. This function is just a placeholder as-is, * Use for only special debugging. This function is just a placeholder as-is,
* you'll need to provide the special bits! ... * you'll need to provide the special bits! ...
* ... and set IWL_EVT_DISABLE to 1. */ * ... and set IWL_EVT_DISABLE to 1. */
void iwl3945_disable_events(struct iwl3945_priv *priv) void iwl3945_disable_events(struct iwl_priv *priv)
{ {
int ret; int ret;
int i; int i;
...@@ -206,7 +206,7 @@ static int iwl3945_hwrate_to_plcp_idx(u8 plcp) ...@@ -206,7 +206,7 @@ static int iwl3945_hwrate_to_plcp_idx(u8 plcp)
* IWL_ANTENNA_MAIN - Force MAIN antenna * IWL_ANTENNA_MAIN - Force MAIN antenna
* IWL_ANTENNA_AUX - Force AUX antenna * IWL_ANTENNA_AUX - Force AUX antenna
*/ */
__le32 iwl3945_get_antenna_flags(const struct iwl3945_priv *priv) __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv)
{ {
switch (priv->antenna) { switch (priv->antenna) {
case IWL_ANTENNA_DIVERSITY: case IWL_ANTENNA_DIVERSITY:
...@@ -268,7 +268,7 @@ static inline const char *iwl3945_get_tx_fail_reason(u32 status) ...@@ -268,7 +268,7 @@ static inline const char *iwl3945_get_tx_fail_reason(u32 status)
* for A and B mode we need to overright prev * for A and B mode we need to overright prev
* value * value
*/ */
int iwl3945_rs_next_rate(struct iwl3945_priv *priv, int rate) int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate)
{ {
int next_rate = iwl3945_get_prev_ieee_rate(rate); int next_rate = iwl3945_get_prev_ieee_rate(rate);
...@@ -302,7 +302,7 @@ int iwl3945_rs_next_rate(struct iwl3945_priv *priv, int rate) ...@@ -302,7 +302,7 @@ int iwl3945_rs_next_rate(struct iwl3945_priv *priv, int rate)
* need to be reclaimed. As result, some free space forms. If there is * need to be reclaimed. As result, some free space forms. If there is
* enough free space (> low mark), wake the stack that feeds us. * enough free space (> low mark), wake the stack that feeds us.
*/ */
static void iwl3945_tx_queue_reclaim(struct iwl3945_priv *priv, static void iwl3945_tx_queue_reclaim(struct iwl_priv *priv,
int txq_id, int index) int txq_id, int index)
{ {
struct iwl3945_tx_queue *txq = &priv->txq39[txq_id]; struct iwl3945_tx_queue *txq = &priv->txq39[txq_id];
...@@ -329,7 +329,7 @@ static void iwl3945_tx_queue_reclaim(struct iwl3945_priv *priv, ...@@ -329,7 +329,7 @@ static void iwl3945_tx_queue_reclaim(struct iwl3945_priv *priv,
/** /**
* iwl3945_rx_reply_tx - Handle Tx response * iwl3945_rx_reply_tx - Handle Tx response
*/ */
static void iwl3945_rx_reply_tx(struct iwl3945_priv *priv, static void iwl3945_rx_reply_tx(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -389,7 +389,7 @@ static void iwl3945_rx_reply_tx(struct iwl3945_priv *priv, ...@@ -389,7 +389,7 @@ static void iwl3945_rx_reply_tx(struct iwl3945_priv *priv,
* *
*****************************************************************************/ *****************************************************************************/
void iwl3945_hw_rx_statistics(struct iwl3945_priv *priv, struct iwl_rx_mem_buffer *rxb) void iwl3945_hw_rx_statistics(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
IWL_DEBUG_RX("Statistics notification received (%d vs %d).\n", IWL_DEBUG_RX("Statistics notification received (%d vs %d).\n",
...@@ -417,7 +417,7 @@ void iwl3945_hw_rx_statistics(struct iwl3945_priv *priv, struct iwl_rx_mem_buffe ...@@ -417,7 +417,7 @@ void iwl3945_hw_rx_statistics(struct iwl3945_priv *priv, struct iwl_rx_mem_buffe
* including selective frame dumps. * including selective frame dumps.
* group100 parameter selects whether to show 1 out of 100 good frames. * group100 parameter selects whether to show 1 out of 100 good frames.
*/ */
static void iwl3945_dbg_report_frame(struct iwl3945_priv *priv, static void iwl3945_dbg_report_frame(struct iwl_priv *priv,
struct iwl_rx_packet *pkt, struct iwl_rx_packet *pkt,
struct ieee80211_hdr *header, int group100) struct ieee80211_hdr *header, int group100)
{ {
...@@ -545,7 +545,7 @@ static void iwl3945_dbg_report_frame(struct iwl3945_priv *priv, ...@@ -545,7 +545,7 @@ static void iwl3945_dbg_report_frame(struct iwl3945_priv *priv,
iwl_print_hex_dump(priv, IWL_DL_RX, data, length); iwl_print_hex_dump(priv, IWL_DL_RX, data, length);
} }
#else #else
static inline void iwl3945_dbg_report_frame(struct iwl3945_priv *priv, static inline void iwl3945_dbg_report_frame(struct iwl_priv *priv,
struct iwl_rx_packet *pkt, struct iwl_rx_packet *pkt,
struct ieee80211_hdr *header, int group100) struct ieee80211_hdr *header, int group100)
{ {
...@@ -553,7 +553,7 @@ static inline void iwl3945_dbg_report_frame(struct iwl3945_priv *priv, ...@@ -553,7 +553,7 @@ static inline void iwl3945_dbg_report_frame(struct iwl3945_priv *priv,
#endif #endif
/* This is necessary only for a number of statistics, see the caller. */ /* This is necessary only for a number of statistics, see the caller. */
static int iwl3945_is_network_packet(struct iwl3945_priv *priv, static int iwl3945_is_network_packet(struct iwl_priv *priv,
struct ieee80211_hdr *header) struct ieee80211_hdr *header)
{ {
/* Filter incoming packets to determine if they are targeted toward /* Filter incoming packets to determine if they are targeted toward
...@@ -570,7 +570,7 @@ static int iwl3945_is_network_packet(struct iwl3945_priv *priv, ...@@ -570,7 +570,7 @@ static int iwl3945_is_network_packet(struct iwl3945_priv *priv,
} }
} }
static void iwl3945_pass_packet_to_mac80211(struct iwl3945_priv *priv, static void iwl3945_pass_packet_to_mac80211(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb, struct iwl_rx_mem_buffer *rxb,
struct ieee80211_rx_status *stats) struct ieee80211_rx_status *stats)
{ {
...@@ -613,7 +613,7 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl3945_priv *priv, ...@@ -613,7 +613,7 @@ static void iwl3945_pass_packet_to_mac80211(struct iwl3945_priv *priv,
#define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6) #define IWL_DELAY_NEXT_SCAN_AFTER_ASSOC (HZ*6)
static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv, static void iwl3945_rx_reply_rx(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct ieee80211_hdr *header; struct ieee80211_hdr *header;
...@@ -723,7 +723,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv, ...@@ -723,7 +723,7 @@ static void iwl3945_rx_reply_rx(struct iwl3945_priv *priv,
iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status); iwl3945_pass_packet_to_mac80211(priv, rxb, &rx_status);
} }
int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl3945_priv *priv, void *ptr, int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *ptr,
dma_addr_t addr, u16 len) dma_addr_t addr, u16 len)
{ {
int count; int count;
...@@ -755,7 +755,7 @@ int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl3945_priv *priv, void *ptr, ...@@ -755,7 +755,7 @@ int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl3945_priv *priv, void *ptr,
* *
* Does NOT advance any indexes * Does NOT advance any indexes
*/ */
int iwl3945_hw_txq_free_tfd(struct iwl3945_priv *priv, struct iwl3945_tx_queue *txq) int iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl3945_tx_queue *txq)
{ {
struct iwl3945_tfd_frame *bd_tmp = (struct iwl3945_tfd_frame *)&txq->bd[0]; struct iwl3945_tfd_frame *bd_tmp = (struct iwl3945_tfd_frame *)&txq->bd[0];
struct iwl3945_tfd_frame *bd = &bd_tmp[txq->q.read_ptr]; struct iwl3945_tfd_frame *bd = &bd_tmp[txq->q.read_ptr];
...@@ -793,7 +793,7 @@ int iwl3945_hw_txq_free_tfd(struct iwl3945_priv *priv, struct iwl3945_tx_queue * ...@@ -793,7 +793,7 @@ int iwl3945_hw_txq_free_tfd(struct iwl3945_priv *priv, struct iwl3945_tx_queue *
return 0; return 0;
} }
u8 iwl3945_hw_find_station(struct iwl3945_priv *priv, const u8 *addr) u8 iwl3945_hw_find_station(struct iwl_priv *priv, const u8 *addr)
{ {
int i, start = IWL_AP_ID; int i, start = IWL_AP_ID;
int ret = IWL_INVALID_STATION; int ret = IWL_INVALID_STATION;
...@@ -826,7 +826,7 @@ u8 iwl3945_hw_find_station(struct iwl3945_priv *priv, const u8 *addr) ...@@ -826,7 +826,7 @@ u8 iwl3945_hw_find_station(struct iwl3945_priv *priv, const u8 *addr)
* iwl3945_hw_build_tx_cmd_rate - Add rate portion to TX_CMD: * iwl3945_hw_build_tx_cmd_rate - Add rate portion to TX_CMD:
* *
*/ */
void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv, void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,
struct iwl3945_cmd *cmd, struct iwl3945_cmd *cmd,
struct ieee80211_tx_info *info, struct ieee80211_tx_info *info,
struct ieee80211_hdr *hdr, int sta_id, int tx_id) struct ieee80211_hdr *hdr, int sta_id, int tx_id)
...@@ -896,7 +896,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv, ...@@ -896,7 +896,7 @@ void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv,
cmd->cmd.tx.supp_rates[1], cmd->cmd.tx.supp_rates[0]); cmd->cmd.tx.supp_rates[1], cmd->cmd.tx.supp_rates[0]);
} }
u8 iwl3945_sync_sta(struct iwl3945_priv *priv, int sta_id, u16 tx_rate, u8 flags) u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, u16 tx_rate, u8 flags)
{ {
unsigned long flags_spin; unsigned long flags_spin;
struct iwl3945_station_entry *station; struct iwl3945_station_entry *station;
...@@ -919,7 +919,7 @@ u8 iwl3945_sync_sta(struct iwl3945_priv *priv, int sta_id, u16 tx_rate, u8 flags ...@@ -919,7 +919,7 @@ u8 iwl3945_sync_sta(struct iwl3945_priv *priv, int sta_id, u16 tx_rate, u8 flags
return sta_id; return sta_id;
} }
static int iwl3945_nic_set_pwr_src(struct iwl3945_priv *priv, int pwr_max) static int iwl3945_nic_set_pwr_src(struct iwl_priv *priv, int pwr_max)
{ {
int rc; int rc;
unsigned long flags; unsigned long flags;
...@@ -961,7 +961,7 @@ static int iwl3945_nic_set_pwr_src(struct iwl3945_priv *priv, int pwr_max) ...@@ -961,7 +961,7 @@ static int iwl3945_nic_set_pwr_src(struct iwl3945_priv *priv, int pwr_max)
return rc; return rc;
} }
static int iwl3945_rx_init(struct iwl3945_priv *priv, struct iwl_rx_queue *rxq) static int iwl3945_rx_init(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
{ {
int rc; int rc;
unsigned long flags; unsigned long flags;
...@@ -997,7 +997,7 @@ static int iwl3945_rx_init(struct iwl3945_priv *priv, struct iwl_rx_queue *rxq) ...@@ -997,7 +997,7 @@ static int iwl3945_rx_init(struct iwl3945_priv *priv, struct iwl_rx_queue *rxq)
return 0; return 0;
} }
static int iwl3945_tx_reset(struct iwl3945_priv *priv) static int iwl3945_tx_reset(struct iwl_priv *priv)
{ {
int rc; int rc;
unsigned long flags; unsigned long flags;
...@@ -1046,7 +1046,7 @@ static int iwl3945_tx_reset(struct iwl3945_priv *priv) ...@@ -1046,7 +1046,7 @@ static int iwl3945_tx_reset(struct iwl3945_priv *priv)
* *
* Destroys all DMA structures and initialize them again * Destroys all DMA structures and initialize them again
*/ */
static int iwl3945_txq_ctx_reset(struct iwl3945_priv *priv) static int iwl3945_txq_ctx_reset(struct iwl_priv *priv)
{ {
int rc; int rc;
int txq_id, slots_num; int txq_id, slots_num;
...@@ -1077,7 +1077,7 @@ static int iwl3945_txq_ctx_reset(struct iwl3945_priv *priv) ...@@ -1077,7 +1077,7 @@ static int iwl3945_txq_ctx_reset(struct iwl3945_priv *priv)
return rc; return rc;
} }
int iwl3945_hw_nic_init(struct iwl3945_priv *priv) int iwl3945_hw_nic_init(struct iwl_priv *priv)
{ {
u8 rev_id; u8 rev_id;
int rc; int rc;
...@@ -1218,7 +1218,7 @@ int iwl3945_hw_nic_init(struct iwl3945_priv *priv) ...@@ -1218,7 +1218,7 @@ int iwl3945_hw_nic_init(struct iwl3945_priv *priv)
* *
* Destroy all TX DMA queues and structures * Destroy all TX DMA queues and structures
*/ */
void iwl3945_hw_txq_ctx_free(struct iwl3945_priv *priv) void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv)
{ {
int txq_id; int txq_id;
...@@ -1227,7 +1227,7 @@ void iwl3945_hw_txq_ctx_free(struct iwl3945_priv *priv) ...@@ -1227,7 +1227,7 @@ void iwl3945_hw_txq_ctx_free(struct iwl3945_priv *priv)
iwl3945_tx_queue_free(priv, &priv->txq39[txq_id]); iwl3945_tx_queue_free(priv, &priv->txq39[txq_id]);
} }
void iwl3945_hw_txq_ctx_stop(struct iwl3945_priv *priv) void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv)
{ {
int txq_id; int txq_id;
unsigned long flags; unsigned long flags;
...@@ -1256,7 +1256,7 @@ void iwl3945_hw_txq_ctx_stop(struct iwl3945_priv *priv) ...@@ -1256,7 +1256,7 @@ void iwl3945_hw_txq_ctx_stop(struct iwl3945_priv *priv)
iwl3945_hw_txq_ctx_free(priv); iwl3945_hw_txq_ctx_free(priv);
} }
int iwl3945_hw_nic_stop_master(struct iwl3945_priv *priv) int iwl3945_hw_nic_stop_master(struct iwl_priv *priv)
{ {
int rc = 0; int rc = 0;
u32 reg_val; u32 reg_val;
...@@ -1288,7 +1288,7 @@ int iwl3945_hw_nic_stop_master(struct iwl3945_priv *priv) ...@@ -1288,7 +1288,7 @@ int iwl3945_hw_nic_stop_master(struct iwl3945_priv *priv)
return rc; return rc;
} }
int iwl3945_hw_nic_reset(struct iwl3945_priv *priv) int iwl3945_hw_nic_reset(struct iwl_priv *priv)
{ {
int rc; int rc;
unsigned long flags; unsigned long flags;
...@@ -1356,7 +1356,7 @@ static inline int iwl3945_hw_reg_temp_out_of_range(int temperature) ...@@ -1356,7 +1356,7 @@ static inline int iwl3945_hw_reg_temp_out_of_range(int temperature)
return ((temperature < -260) || (temperature > 25)) ? 1 : 0; return ((temperature < -260) || (temperature > 25)) ? 1 : 0;
} }
int iwl3945_hw_get_temperature(struct iwl3945_priv *priv) int iwl3945_hw_get_temperature(struct iwl_priv *priv)
{ {
return iwl3945_read32(priv, CSR_UCODE_DRV_GP2); return iwl3945_read32(priv, CSR_UCODE_DRV_GP2);
} }
...@@ -1365,7 +1365,7 @@ int iwl3945_hw_get_temperature(struct iwl3945_priv *priv) ...@@ -1365,7 +1365,7 @@ int iwl3945_hw_get_temperature(struct iwl3945_priv *priv)
* iwl3945_hw_reg_txpower_get_temperature * iwl3945_hw_reg_txpower_get_temperature
* get the current temperature by reading from NIC * get the current temperature by reading from NIC
*/ */
static int iwl3945_hw_reg_txpower_get_temperature(struct iwl3945_priv *priv) static int iwl3945_hw_reg_txpower_get_temperature(struct iwl_priv *priv)
{ {
int temperature; int temperature;
...@@ -1401,7 +1401,7 @@ static int iwl3945_hw_reg_txpower_get_temperature(struct iwl3945_priv *priv) ...@@ -1401,7 +1401,7 @@ static int iwl3945_hw_reg_txpower_get_temperature(struct iwl3945_priv *priv)
* records new temperature in tx_mgr->temperature. * records new temperature in tx_mgr->temperature.
* replaces tx_mgr->last_temperature *only* if calib needed * replaces tx_mgr->last_temperature *only* if calib needed
* (assumes caller will actually do the calibration!). */ * (assumes caller will actually do the calibration!). */
static int is_temp_calib_needed(struct iwl3945_priv *priv) static int is_temp_calib_needed(struct iwl_priv *priv)
{ {
int temp_diff; int temp_diff;
...@@ -1616,7 +1616,7 @@ static inline u8 iwl3945_hw_reg_fix_power_index(int index) ...@@ -1616,7 +1616,7 @@ static inline u8 iwl3945_hw_reg_fix_power_index(int index)
* Set (in our channel info database) the direct scan Tx power for 1 Mbit (CCK) * Set (in our channel info database) the direct scan Tx power for 1 Mbit (CCK)
* or 6 Mbit (OFDM) rates. * or 6 Mbit (OFDM) rates.
*/ */
static void iwl3945_hw_reg_set_scan_power(struct iwl3945_priv *priv, u32 scan_tbl_index, static void iwl3945_hw_reg_set_scan_power(struct iwl_priv *priv, u32 scan_tbl_index,
s32 rate_index, const s8 *clip_pwrs, s32 rate_index, const s8 *clip_pwrs,
struct iwl_channel_info *ch_info, struct iwl_channel_info *ch_info,
int band_index) int band_index)
...@@ -1672,7 +1672,7 @@ static void iwl3945_hw_reg_set_scan_power(struct iwl3945_priv *priv, u32 scan_tb ...@@ -1672,7 +1672,7 @@ static void iwl3945_hw_reg_set_scan_power(struct iwl3945_priv *priv, u32 scan_tb
* Configures power settings for all rates for the current channel, * Configures power settings for all rates for the current channel,
* using values from channel info struct, and send to NIC * using values from channel info struct, and send to NIC
*/ */
int iwl3945_hw_reg_send_txpower(struct iwl3945_priv *priv) int iwl3945_hw_reg_send_txpower(struct iwl_priv *priv)
{ {
int rate_idx, i; int rate_idx, i;
const struct iwl_channel_info *ch_info = NULL; const struct iwl_channel_info *ch_info = NULL;
...@@ -1747,7 +1747,7 @@ int iwl3945_hw_reg_send_txpower(struct iwl3945_priv *priv) ...@@ -1747,7 +1747,7 @@ int iwl3945_hw_reg_send_txpower(struct iwl3945_priv *priv)
* properly fill out the scan powers, and actual h/w gain settings, * properly fill out the scan powers, and actual h/w gain settings,
* and send changes to NIC * and send changes to NIC
*/ */
static int iwl3945_hw_reg_set_new_power(struct iwl3945_priv *priv, static int iwl3945_hw_reg_set_new_power(struct iwl_priv *priv,
struct iwl_channel_info *ch_info) struct iwl_channel_info *ch_info)
{ {
struct iwl3945_channel_power_info *power_info; struct iwl3945_channel_power_info *power_info;
...@@ -1838,7 +1838,7 @@ static int iwl3945_hw_reg_get_ch_txpower_limit(struct iwl_channel_info *ch_info) ...@@ -1838,7 +1838,7 @@ static int iwl3945_hw_reg_get_ch_txpower_limit(struct iwl_channel_info *ch_info)
* *
* If RxOn is "associated", this sends the new Txpower to NIC! * If RxOn is "associated", this sends the new Txpower to NIC!
*/ */
static int iwl3945_hw_reg_comp_txpower_temp(struct iwl3945_priv *priv) static int iwl3945_hw_reg_comp_txpower_temp(struct iwl_priv *priv)
{ {
struct iwl_channel_info *ch_info = NULL; struct iwl_channel_info *ch_info = NULL;
int delta_index; int delta_index;
...@@ -1899,7 +1899,7 @@ static int iwl3945_hw_reg_comp_txpower_temp(struct iwl3945_priv *priv) ...@@ -1899,7 +1899,7 @@ static int iwl3945_hw_reg_comp_txpower_temp(struct iwl3945_priv *priv)
return iwl3945_hw_reg_send_txpower(priv); return iwl3945_hw_reg_send_txpower(priv);
} }
int iwl3945_hw_reg_set_txpower(struct iwl3945_priv *priv, s8 power) int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power)
{ {
struct iwl_channel_info *ch_info; struct iwl_channel_info *ch_info;
s8 max_power; s8 max_power;
...@@ -1942,7 +1942,7 @@ int iwl3945_hw_reg_set_txpower(struct iwl3945_priv *priv, s8 power) ...@@ -1942,7 +1942,7 @@ int iwl3945_hw_reg_set_txpower(struct iwl3945_priv *priv, s8 power)
} }
/* will add 3945 channel switch cmd handling later */ /* will add 3945 channel switch cmd handling later */
int iwl3945_hw_channel_switch(struct iwl3945_priv *priv, u16 channel) int iwl3945_hw_channel_switch(struct iwl_priv *priv, u16 channel)
{ {
return 0; return 0;
} }
...@@ -1957,7 +1957,7 @@ int iwl3945_hw_channel_switch(struct iwl3945_priv *priv, u16 channel) ...@@ -1957,7 +1957,7 @@ int iwl3945_hw_channel_switch(struct iwl3945_priv *priv, u16 channel)
* -- send new set of gain settings to NIC * -- send new set of gain settings to NIC
* NOTE: This should continue working, even when we're not associated, * NOTE: This should continue working, even when we're not associated,
* so we can keep our internal table of scan powers current. */ * so we can keep our internal table of scan powers current. */
void iwl3945_reg_txpower_periodic(struct iwl3945_priv *priv) void iwl3945_reg_txpower_periodic(struct iwl_priv *priv)
{ {
/* This will kick in the "brute force" /* This will kick in the "brute force"
* iwl3945_hw_reg_comp_txpower_temp() below */ * iwl3945_hw_reg_comp_txpower_temp() below */
...@@ -1976,7 +1976,7 @@ void iwl3945_reg_txpower_periodic(struct iwl3945_priv *priv) ...@@ -1976,7 +1976,7 @@ void iwl3945_reg_txpower_periodic(struct iwl3945_priv *priv)
static void iwl3945_bg_reg_txpower_periodic(struct work_struct *work) static void iwl3945_bg_reg_txpower_periodic(struct work_struct *work)
{ {
struct iwl3945_priv *priv = container_of(work, struct iwl3945_priv, struct iwl_priv *priv = container_of(work, struct iwl_priv,
thermal_periodic.work); thermal_periodic.work);
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
...@@ -1998,7 +1998,7 @@ static void iwl3945_bg_reg_txpower_periodic(struct work_struct *work) ...@@ -1998,7 +1998,7 @@ static void iwl3945_bg_reg_txpower_periodic(struct work_struct *work)
* on A-band, EEPROM's "group frequency" entries represent the top * on A-band, EEPROM's "group frequency" entries represent the top
* channel in each group 1-4. Group 5 All B/G channels are in group 0. * channel in each group 1-4. Group 5 All B/G channels are in group 0.
*/ */
static u16 iwl3945_hw_reg_get_ch_grp_index(struct iwl3945_priv *priv, static u16 iwl3945_hw_reg_get_ch_grp_index(struct iwl_priv *priv,
const struct iwl_channel_info *ch_info) const struct iwl_channel_info *ch_info)
{ {
struct iwl3945_eeprom_txpower_group *ch_grp = &priv->eeprom39.groups[0]; struct iwl3945_eeprom_txpower_group *ch_grp = &priv->eeprom39.groups[0];
...@@ -2032,7 +2032,7 @@ static u16 iwl3945_hw_reg_get_ch_grp_index(struct iwl3945_priv *priv, ...@@ -2032,7 +2032,7 @@ static u16 iwl3945_hw_reg_get_ch_grp_index(struct iwl3945_priv *priv,
* Interpolate to get nominal (i.e. at factory calibration temperature) index * Interpolate to get nominal (i.e. at factory calibration temperature) index
* into radio/DSP gain settings table for requested power. * into radio/DSP gain settings table for requested power.
*/ */
static int iwl3945_hw_reg_get_matched_power_index(struct iwl3945_priv *priv, static int iwl3945_hw_reg_get_matched_power_index(struct iwl_priv *priv,
s8 requested_power, s8 requested_power,
s32 setting_index, s32 *new_index) s32 setting_index, s32 *new_index)
{ {
...@@ -2080,7 +2080,7 @@ static int iwl3945_hw_reg_get_matched_power_index(struct iwl3945_priv *priv, ...@@ -2080,7 +2080,7 @@ static int iwl3945_hw_reg_get_matched_power_index(struct iwl3945_priv *priv,
return 0; return 0;
} }
static void iwl3945_hw_reg_init_channel_groups(struct iwl3945_priv *priv) static void iwl3945_hw_reg_init_channel_groups(struct iwl_priv *priv)
{ {
u32 i; u32 i;
s32 rate_index; s32 rate_index;
...@@ -2160,7 +2160,7 @@ static void iwl3945_hw_reg_init_channel_groups(struct iwl3945_priv *priv) ...@@ -2160,7 +2160,7 @@ static void iwl3945_hw_reg_init_channel_groups(struct iwl3945_priv *priv)
* *
* This does *not* write values to NIC, just sets up our internal table. * This does *not* write values to NIC, just sets up our internal table.
*/ */
int iwl3945_txpower_set_from_eeprom(struct iwl3945_priv *priv) int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv)
{ {
struct iwl_channel_info *ch_info = NULL; struct iwl_channel_info *ch_info = NULL;
struct iwl3945_channel_power_info *pwr_info; struct iwl3945_channel_power_info *pwr_info;
...@@ -2284,7 +2284,7 @@ int iwl3945_txpower_set_from_eeprom(struct iwl3945_priv *priv) ...@@ -2284,7 +2284,7 @@ int iwl3945_txpower_set_from_eeprom(struct iwl3945_priv *priv)
return 0; return 0;
} }
int iwl3945_hw_rxq_stop(struct iwl3945_priv *priv) int iwl3945_hw_rxq_stop(struct iwl_priv *priv)
{ {
int rc; int rc;
unsigned long flags; unsigned long flags;
...@@ -2308,7 +2308,7 @@ int iwl3945_hw_rxq_stop(struct iwl3945_priv *priv) ...@@ -2308,7 +2308,7 @@ int iwl3945_hw_rxq_stop(struct iwl3945_priv *priv)
return 0; return 0;
} }
int iwl3945_hw_tx_queue_init(struct iwl3945_priv *priv, struct iwl3945_tx_queue *txq) int iwl3945_hw_tx_queue_init(struct iwl_priv *priv, struct iwl3945_tx_queue *txq)
{ {
int rc; int rc;
unsigned long flags; unsigned long flags;
...@@ -2342,7 +2342,7 @@ int iwl3945_hw_tx_queue_init(struct iwl3945_priv *priv, struct iwl3945_tx_queue ...@@ -2342,7 +2342,7 @@ int iwl3945_hw_tx_queue_init(struct iwl3945_priv *priv, struct iwl3945_tx_queue
return 0; return 0;
} }
int iwl3945_hw_get_rx_read(struct iwl3945_priv *priv) int iwl3945_hw_get_rx_read(struct iwl_priv *priv)
{ {
struct iwl3945_shared *shared_data = priv->shared_virt; struct iwl3945_shared *shared_data = priv->shared_virt;
...@@ -2352,7 +2352,7 @@ int iwl3945_hw_get_rx_read(struct iwl3945_priv *priv) ...@@ -2352,7 +2352,7 @@ int iwl3945_hw_get_rx_read(struct iwl3945_priv *priv)
/** /**
* iwl3945_init_hw_rate_table - Initialize the hardware rate fallback table * iwl3945_init_hw_rate_table - Initialize the hardware rate fallback table
*/ */
int iwl3945_init_hw_rate_table(struct iwl3945_priv *priv) int iwl3945_init_hw_rate_table(struct iwl_priv *priv)
{ {
int rc, i, index, prev_index; int rc, i, index, prev_index;
struct iwl3945_rate_scaling_cmd rate_cmd = { struct iwl3945_rate_scaling_cmd rate_cmd = {
...@@ -2429,7 +2429,7 @@ int iwl3945_init_hw_rate_table(struct iwl3945_priv *priv) ...@@ -2429,7 +2429,7 @@ int iwl3945_init_hw_rate_table(struct iwl3945_priv *priv)
} }
/* Called when initializing driver */ /* Called when initializing driver */
int iwl3945_hw_set_hw_params(struct iwl3945_priv *priv) int iwl3945_hw_set_hw_params(struct iwl_priv *priv)
{ {
memset((void *)&priv->hw_params, 0, memset((void *)&priv->hw_params, 0,
sizeof(struct iwl_hw_params)); sizeof(struct iwl_hw_params));
...@@ -2456,7 +2456,7 @@ int iwl3945_hw_set_hw_params(struct iwl3945_priv *priv) ...@@ -2456,7 +2456,7 @@ int iwl3945_hw_set_hw_params(struct iwl3945_priv *priv)
return 0; return 0;
} }
unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv, unsigned int iwl3945_hw_get_beacon_cmd(struct iwl_priv *priv,
struct iwl3945_frame *frame, u8 rate) struct iwl3945_frame *frame, u8 rate)
{ {
struct iwl3945_tx_beacon_cmd *tx_beacon_cmd; struct iwl3945_tx_beacon_cmd *tx_beacon_cmd;
...@@ -2489,19 +2489,19 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv, ...@@ -2489,19 +2489,19 @@ unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv,
return sizeof(struct iwl3945_tx_beacon_cmd) + frame_size; return sizeof(struct iwl3945_tx_beacon_cmd) + frame_size;
} }
void iwl3945_hw_rx_handler_setup(struct iwl3945_priv *priv) void iwl3945_hw_rx_handler_setup(struct iwl_priv *priv)
{ {
priv->rx_handlers[REPLY_TX] = iwl3945_rx_reply_tx; priv->rx_handlers[REPLY_TX] = iwl3945_rx_reply_tx;
priv->rx_handlers[REPLY_3945_RX] = iwl3945_rx_reply_rx; priv->rx_handlers[REPLY_3945_RX] = iwl3945_rx_reply_rx;
} }
void iwl3945_hw_setup_deferred_work(struct iwl3945_priv *priv) void iwl3945_hw_setup_deferred_work(struct iwl_priv *priv)
{ {
INIT_DELAYED_WORK(&priv->thermal_periodic, INIT_DELAYED_WORK(&priv->thermal_periodic,
iwl3945_bg_reg_txpower_periodic); iwl3945_bg_reg_txpower_periodic);
} }
void iwl3945_hw_cancel_deferred_work(struct iwl3945_priv *priv) void iwl3945_hw_cancel_deferred_work(struct iwl_priv *priv)
{ {
cancel_delayed_work(&priv->thermal_periodic); cancel_delayed_work(&priv->thermal_periodic);
} }
......
drivers/net/wireless/iwlwifi/iwl-3945.h
View file @ 4a8a4322
...@@ -148,13 +148,13 @@ struct iwl3945_frame { ...@@ -148,13 +148,13 @@ struct iwl3945_frame {
#define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4) #define MAX_SN ((IEEE80211_SCTL_SEQ) >> 4)
struct iwl3945_cmd; struct iwl3945_cmd;
struct iwl3945_priv; struct iwl_priv;
struct iwl3945_cmd_meta { struct iwl3945_cmd_meta {
struct iwl3945_cmd_meta *source; struct iwl3945_cmd_meta *source;
union { union {
struct sk_buff *skb; struct sk_buff *skb;
int (*callback)(struct iwl3945_priv *priv, int (*callback)(struct iwl_priv *priv,
struct iwl3945_cmd *cmd, struct sk_buff *skb); struct iwl3945_cmd *cmd, struct sk_buff *skb);
} __attribute__ ((packed)) u; } __attribute__ ((packed)) u;
...@@ -270,31 +270,31 @@ struct iwl3945_ibss_seq { ...@@ -270,31 +270,31 @@ struct iwl3945_ibss_seq {
* *
*****************************************************************************/ *****************************************************************************/
struct iwl3945_addsta_cmd; struct iwl3945_addsta_cmd;
extern int iwl3945_send_add_station(struct iwl3945_priv *priv, extern int iwl3945_send_add_station(struct iwl_priv *priv,
struct iwl3945_addsta_cmd *sta, u8 flags); struct iwl3945_addsta_cmd *sta, u8 flags);
extern u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *bssid, extern u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *bssid,
int is_ap, u8 flags); int is_ap, u8 flags);
extern int iwl3945_power_init_handle(struct iwl3945_priv *priv); extern int iwl3945_power_init_handle(struct iwl_priv *priv);
extern int iwl3945_eeprom_init(struct iwl3945_priv *priv); extern int iwl3945_eeprom_init(struct iwl_priv *priv);
extern int iwl3945_rx_queue_alloc(struct iwl3945_priv *priv); extern int iwl3945_rx_queue_alloc(struct iwl_priv *priv);
extern void iwl3945_rx_queue_reset(struct iwl3945_priv *priv, extern void iwl3945_rx_queue_reset(struct iwl_priv *priv,
struct iwl_rx_queue *rxq); struct iwl_rx_queue *rxq);
extern int iwl3945_calc_db_from_ratio(int sig_ratio); extern int iwl3945_calc_db_from_ratio(int sig_ratio);
extern int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm); extern int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm);
extern int iwl3945_tx_queue_init(struct iwl3945_priv *priv, extern int iwl3945_tx_queue_init(struct iwl_priv *priv,
struct iwl3945_tx_queue *txq, int count, u32 id); struct iwl3945_tx_queue *txq, int count, u32 id);
extern void iwl3945_rx_replenish(void *data); extern void iwl3945_rx_replenish(void *data);
extern void iwl3945_tx_queue_free(struct iwl3945_priv *priv, struct iwl3945_tx_queue *txq); extern void iwl3945_tx_queue_free(struct iwl_priv *priv, struct iwl3945_tx_queue *txq);
extern int iwl3945_send_cmd_pdu(struct iwl3945_priv *priv, u8 id, u16 len, extern int iwl3945_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len,
const void *data); const void *data);
extern int __must_check iwl3945_send_cmd(struct iwl3945_priv *priv, extern int __must_check iwl3945_send_cmd(struct iwl_priv *priv,
struct iwl3945_host_cmd *cmd); struct iwl3945_host_cmd *cmd);
extern unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv, extern unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
struct ieee80211_hdr *hdr,int left); struct ieee80211_hdr *hdr,int left);
extern int iwl3945_rx_queue_update_write_ptr(struct iwl3945_priv *priv, extern int iwl3945_rx_queue_update_write_ptr(struct iwl_priv *priv,
struct iwl_rx_queue *q); struct iwl_rx_queue *q);
extern int iwl3945_send_statistics_request(struct iwl3945_priv *priv); extern int iwl3945_send_statistics_request(struct iwl_priv *priv);
extern void iwl3945_set_decrypted_flag(struct iwl3945_priv *priv, struct sk_buff *skb, extern void iwl3945_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,
u32 decrypt_res, u32 decrypt_res,
struct ieee80211_rx_status *stats); struct ieee80211_rx_status *stats);
...@@ -302,7 +302,7 @@ extern void iwl3945_set_decrypted_flag(struct iwl3945_priv *priv, struct sk_buff ...@@ -302,7 +302,7 @@ extern void iwl3945_set_decrypted_flag(struct iwl3945_priv *priv, struct sk_buff
* Currently used by iwl-3945-rs... look at restructuring so that it doesn't * Currently used by iwl-3945-rs... look at restructuring so that it doesn't
* call this... todo... fix that. * call this... todo... fix that.
*/ */
extern u8 iwl3945_sync_station(struct iwl3945_priv *priv, int sta_id, extern u8 iwl3945_sync_station(struct iwl_priv *priv, int sta_id,
u16 tx_rate, u8 flags); u16 tx_rate, u8 flags);
/****************************************************************************** /******************************************************************************
...@@ -321,36 +321,36 @@ extern u8 iwl3945_sync_station(struct iwl3945_priv *priv, int sta_id, ...@@ -321,36 +321,36 @@ extern u8 iwl3945_sync_station(struct iwl3945_priv *priv, int sta_id,
* iwl3945_mac_ <-- mac80211 callback * iwl3945_mac_ <-- mac80211 callback
* *
****************************************************************************/ ****************************************************************************/
extern void iwl3945_hw_rx_handler_setup(struct iwl3945_priv *priv); extern void iwl3945_hw_rx_handler_setup(struct iwl_priv *priv);
extern void iwl3945_hw_setup_deferred_work(struct iwl3945_priv *priv); extern void iwl3945_hw_setup_deferred_work(struct iwl_priv *priv);
extern void iwl3945_hw_cancel_deferred_work(struct iwl3945_priv *priv); extern void iwl3945_hw_cancel_deferred_work(struct iwl_priv *priv);
extern int iwl3945_hw_rxq_stop(struct iwl3945_priv *priv); extern int iwl3945_hw_rxq_stop(struct iwl_priv *priv);
extern int iwl3945_hw_set_hw_params(struct iwl3945_priv *priv); extern int iwl3945_hw_set_hw_params(struct iwl_priv *priv);
extern int iwl3945_hw_nic_init(struct iwl3945_priv *priv); extern int iwl3945_hw_nic_init(struct iwl_priv *priv);
extern int iwl3945_hw_nic_stop_master(struct iwl3945_priv *priv); extern int iwl3945_hw_nic_stop_master(struct iwl_priv *priv);
extern void iwl3945_hw_txq_ctx_free(struct iwl3945_priv *priv); extern void iwl3945_hw_txq_ctx_free(struct iwl_priv *priv);
extern void iwl3945_hw_txq_ctx_stop(struct iwl3945_priv *priv); extern void iwl3945_hw_txq_ctx_stop(struct iwl_priv *priv);
extern int iwl3945_hw_nic_reset(struct iwl3945_priv *priv); extern int iwl3945_hw_nic_reset(struct iwl_priv *priv);
extern int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl3945_priv *priv, void *tfd, extern int iwl3945_hw_txq_attach_buf_to_tfd(struct iwl_priv *priv, void *tfd,
dma_addr_t addr, u16 len); dma_addr_t addr, u16 len);
extern int iwl3945_hw_txq_free_tfd(struct iwl3945_priv *priv, struct iwl3945_tx_queue *txq); extern int iwl3945_hw_txq_free_tfd(struct iwl_priv *priv, struct iwl3945_tx_queue *txq);
extern int iwl3945_hw_get_temperature(struct iwl3945_priv *priv); extern int iwl3945_hw_get_temperature(struct iwl_priv *priv);
extern int iwl3945_hw_tx_queue_init(struct iwl3945_priv *priv, extern int iwl3945_hw_tx_queue_init(struct iwl_priv *priv,
struct iwl3945_tx_queue *txq); struct iwl3945_tx_queue *txq);
extern unsigned int iwl3945_hw_get_beacon_cmd(struct iwl3945_priv *priv, extern unsigned int iwl3945_hw_get_beacon_cmd(struct iwl_priv *priv,
struct iwl3945_frame *frame, u8 rate); struct iwl3945_frame *frame, u8 rate);
extern int iwl3945_hw_get_rx_read(struct iwl3945_priv *priv); extern int iwl3945_hw_get_rx_read(struct iwl_priv *priv);
extern void iwl3945_hw_build_tx_cmd_rate(struct iwl3945_priv *priv, extern void iwl3945_hw_build_tx_cmd_rate(struct iwl_priv *priv,
struct iwl3945_cmd *cmd, struct iwl3945_cmd *cmd,
struct ieee80211_tx_info *info, struct ieee80211_tx_info *info,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
int sta_id, int tx_id); int sta_id, int tx_id);
extern int iwl3945_hw_reg_send_txpower(struct iwl3945_priv *priv); extern int iwl3945_hw_reg_send_txpower(struct iwl_priv *priv);
extern int iwl3945_hw_reg_set_txpower(struct iwl3945_priv *priv, s8 power); extern int iwl3945_hw_reg_set_txpower(struct iwl_priv *priv, s8 power);
extern void iwl3945_hw_rx_statistics(struct iwl3945_priv *priv, extern void iwl3945_hw_rx_statistics(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb); struct iwl_rx_mem_buffer *rxb);
extern void iwl3945_disable_events(struct iwl3945_priv *priv); extern void iwl3945_disable_events(struct iwl_priv *priv);
extern int iwl4965_get_temperature(const struct iwl3945_priv *priv); extern int iwl4965_get_temperature(const struct iwl_priv *priv);
/** /**
* iwl3945_hw_find_station - Find station id for a given BSSID * iwl3945_hw_find_station - Find station id for a given BSSID
...@@ -360,262 +360,43 @@ extern int iwl4965_get_temperature(const struct iwl3945_priv *priv); ...@@ -360,262 +360,43 @@ extern int iwl4965_get_temperature(const struct iwl3945_priv *priv);
* not yet been merged into a single common layer for managing the * not yet been merged into a single common layer for managing the
* station tables. * station tables.
*/ */
extern u8 iwl3945_hw_find_station(struct iwl3945_priv *priv, const u8 *bssid); extern u8 iwl3945_hw_find_station(struct iwl_priv *priv, const u8 *bssid);
extern int iwl3945_hw_channel_switch(struct iwl3945_priv *priv, u16 channel); extern int iwl3945_hw_channel_switch(struct iwl_priv *priv, u16 channel);
/* /*
* Forward declare iwl-3945.c functions for iwl-base.c * Forward declare iwl-3945.c functions for iwl-base.c
*/ */
extern __le32 iwl3945_get_antenna_flags(const struct iwl3945_priv *priv); extern __le32 iwl3945_get_antenna_flags(const struct iwl_priv *priv);
extern int iwl3945_init_hw_rate_table(struct iwl3945_priv *priv); extern int iwl3945_init_hw_rate_table(struct iwl_priv *priv);
extern void iwl3945_reg_txpower_periodic(struct iwl3945_priv *priv); extern void iwl3945_reg_txpower_periodic(struct iwl_priv *priv);
extern int iwl3945_txpower_set_from_eeprom(struct iwl3945_priv *priv); extern int iwl3945_txpower_set_from_eeprom(struct iwl_priv *priv);
extern u8 iwl3945_sync_sta(struct iwl3945_priv *priv, int sta_id, extern u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id,
u16 tx_rate, u8 flags); u16 tx_rate, u8 flags);
#ifdef CONFIG_IWL3945_RFKILL #ifdef CONFIG_IWL3945_RFKILL
struct iwl3945_priv; struct iwl_priv;
void iwl3945_rfkill_set_hw_state(struct iwl3945_priv *priv); void iwl3945_rfkill_set_hw_state(struct iwl_priv *priv);
void iwl3945_rfkill_unregister(struct iwl3945_priv *priv); void iwl3945_rfkill_unregister(struct iwl_priv *priv);
int iwl3945_rfkill_init(struct iwl3945_priv *priv); int iwl3945_rfkill_init(struct iwl_priv *priv);
#else #else
static inline void iwl3945_rfkill_set_hw_state(struct iwl3945_priv *priv) {} static inline void iwl3945_rfkill_set_hw_state(struct iwl_priv *priv) {}
static inline void iwl3945_rfkill_unregister(struct iwl3945_priv *priv) {} static inline void iwl3945_rfkill_unregister(struct iwl_priv *priv) {}
static inline int iwl3945_rfkill_init(struct iwl3945_priv *priv) { return 0; } static inline int iwl3945_rfkill_init(struct iwl_priv *priv) { return 0; }
#endif #endif
static inline int iwl3945_is_associated(struct iwl_priv *priv)
struct iwl3945_priv {
/* ieee device used by generic ieee processing code */
struct ieee80211_hw *hw;
struct ieee80211_channel *ieee_channels;
struct ieee80211_rate *ieee_rates;
struct iwl_cfg *cfg; /* device configuration */
/* temporary frame storage list */
struct list_head free_frames;
int frames_count;
enum ieee80211_band band;
int alloc_rxb_skb;
void (*rx_handlers[REPLY_MAX])(struct iwl3945_priv *priv,
struct iwl_rx_mem_buffer *rxb);
struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
#ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
/* spectrum measurement report caching */
struct iwl_spectrum_notification measure_report;
u8 measurement_status;
#endif
/* ucode beacon time */
u32 ucode_beacon_time;
/* we allocate array of iwl3945_channel_info for NIC's valid channels.
* Access via channel # using indirect index array */
struct iwl_channel_info *channel_info; /* channel info array */
u8 channel_count; /* # of channels */
/* each calibration channel group in the EEPROM has a derived
* clip setting for each rate. */
const struct iwl3945_clip_group clip39_groups[5];
/* thermal calibration */
s32 temperature; /* degrees Kelvin */
s32 last_temperature;
/* Scan related variables */
unsigned long last_scan_jiffies;
unsigned long next_scan_jiffies;
unsigned long scan_start;
unsigned long scan_pass_start;
unsigned long scan_start_tsf;
int scan_bands;
int one_direct_scan;
u8 direct_ssid_len;
u8 direct_ssid[IW_ESSID_MAX_SIZE];
struct iwl3945_scan_cmd *scan39;
/* spinlock */
spinlock_t lock; /* protect general shared data */
spinlock_t hcmd_lock; /* protect hcmd */
struct mutex mutex;
/* basic pci-network driver stuff */
struct pci_dev *pci_dev;
/* pci hardware address support */
void __iomem *hw_base;
/* uCode images, save to reload in case of failure */
u32 ucode_ver; /* ucode version, copy of
iwl_ucode.ver */
struct fw_desc ucode_code; /* runtime inst */
struct fw_desc ucode_data; /* runtime data original */
struct fw_desc ucode_data_backup; /* runtime data save/restore */
struct fw_desc ucode_init; /* initialization inst */
struct fw_desc ucode_init_data; /* initialization data */
struct fw_desc ucode_boot; /* bootstrap inst */
struct iwl_rxon_time_cmd rxon_timing;
/* We declare this const so it can only be
* changed via explicit cast within the
* routines that actually update the physical
* hardware */
const struct iwl3945_rxon_cmd active39_rxon;
struct iwl3945_rxon_cmd staging39_rxon;
int error_recovering;
struct iwl3945_rxon_cmd recovery39_rxon;
/* 1st responses from initialize and runtime uCode images.
* 4965's initialize alive response contains some calibration data. */
/* FIXME: 4965 uses bigger structure for init */
struct iwl_alive_resp card_alive_init;
struct iwl_alive_resp card_alive;
#ifdef CONFIG_IWL3945_RFKILL
struct rfkill *rfkill;
#endif
#ifdef CONFIG_IWL3945_LEDS
struct iwl3945_led led39[IWL_LED_TRG_MAX];
unsigned long last_blink_time;
u8 last_blink_rate;
u8 allow_blinking;
unsigned int rxtxpackets;
u64 led_tpt;
#endif
u16 active_rate;
u16 active_rate_basic;
u32 sta_supp_rates;
u8 call_post_assoc_from_beacon;
/* Rate scaling data */
s8 data_retry_limit;
u8 retry_rate;
wait_queue_head_t wait_command_queue;
int activity_timer_active;
/* Rx and Tx DMA processing queues */
struct iwl_rx_queue rxq;
struct iwl3945_tx_queue txq39[IWL39_MAX_NUM_QUEUES];
unsigned long status;
int last_rx_rssi; /* From Rx packet statisitics */
int last_rx_noise; /* From beacon statistics */
struct iwl3945_power_mgr power_data_39;
struct iwl3945_notif_statistics statistics_39;
unsigned long last_statistics_time;
/* context information */
u16 rates_mask;
u32 power_mode;
u32 antenna;
u8 bssid[ETH_ALEN];
u16 rts_threshold;
u8 mac_addr[ETH_ALEN];
/*station table variables */
spinlock_t sta_lock;
int num_stations;
struct iwl3945_station_entry stations_39[IWL_STATION_COUNT];
/* Indication if ieee80211_ops->open has been called */
u8 is_open;
u8 mac80211_registered;
/* Rx'd packet timing information */
u32 last_beacon_time;
u64 last_tsf;
/* eeprom */
struct iwl3945_eeprom eeprom39;
enum nl80211_iftype iw_mode;
struct sk_buff *ibss_beacon;
/* Last Rx'd beacon timestamp */
u64 timestamp;
u16 beacon_int;
void *shared_virt;
dma_addr_t shared_phys;
struct iwl_hw_params hw_params;
struct ieee80211_vif *vif;
/* Current association information needed to configure the
* hardware */
u16 assoc_id;
u16 assoc_capability;
u8 ps_mode;
struct iwl_qos_info qos_data;
struct workqueue_struct *workqueue;
struct work_struct up;
struct work_struct restart;
struct work_struct calibrated_work;
struct work_struct scan_completed;
struct work_struct rx_replenish;
struct work_struct rf_kill;
struct work_struct abort_scan;
struct work_struct update_link_led;
struct work_struct auth_work;
struct work_struct report_work;
struct work_struct request_scan;
struct work_struct beacon_update;
struct tasklet_struct irq_tasklet;
struct delayed_work init_alive_start;
struct delayed_work alive_start;
struct delayed_work activity_timer;
struct delayed_work thermal_periodic;
struct delayed_work gather_stats;
struct delayed_work scan_check;
#define IWL_DEFAULT_TX_POWER 0x0F
s8 user_txpower_limit;
s8 max_channel_txpower_limit;
#ifdef CONFIG_IWL3945_DEBUG
/* debugging info */
u32 debug_level;
u32 framecnt_to_us;
atomic_t restrict_refcnt;
#endif
}; /*iwl3945_priv */
static inline int iwl3945_is_associated(struct iwl3945_priv *priv)
{ {
return (priv->active39_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0; return (priv->active39_rxon.filter_flags & RXON_FILTER_ASSOC_MSK) ? 1 : 0;
} }
extern const struct iwl_channel_info *iwl3945_get_channel_info( extern const struct iwl_channel_info *iwl3945_get_channel_info(
const struct iwl3945_priv *priv, enum ieee80211_band band, u16 channel); const struct iwl_priv *priv, enum ieee80211_band band, u16 channel);
extern int iwl3945_rs_next_rate(struct iwl3945_priv *priv, int rate); extern int iwl3945_rs_next_rate(struct iwl_priv *priv, int rate);
/* Requires full declaration of iwl3945_priv before including */ /* Requires full declaration of iwl_priv before including */
#include "iwl-3945-io.h" #include "iwl-3945-io.h"
#endif #endif
drivers/net/wireless/iwlwifi/iwl-dev.h
View file @ 4a8a4322
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
#include "iwl-eeprom.h" #include "iwl-eeprom.h"
#include "iwl-4965-hw.h" #include "iwl-4965-hw.h"
#include "iwl-3945-hw.h" #include "iwl-3945-hw.h"
#include "iwl-3945-led.h"
#include "iwl-csr.h" #include "iwl-csr.h"
#include "iwl-prph.h" #include "iwl-prph.h"
#include "iwl-debug.h" #include "iwl-debug.h"
...@@ -835,7 +836,7 @@ struct iwl_priv { ...@@ -835,7 +836,7 @@ struct iwl_priv {
struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS]; struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];
#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT #if defined(CONFIG_IWLAGN_SPECTRUM_MEASUREMENT) || defined(CONFIG_IWL3945_SPECTRUM_MEASUREMENT)
/* spectrum measurement report caching */ /* spectrum measurement report caching */
struct iwl_spectrum_notification measure_report; struct iwl_spectrum_notification measure_report;
u8 measurement_status; u8 measurement_status;
...@@ -916,18 +917,25 @@ struct iwl_priv { ...@@ -916,18 +917,25 @@ struct iwl_priv {
* 4965's initialize alive response contains some calibration data. */ * 4965's initialize alive response contains some calibration data. */
struct iwl_init_alive_resp card_alive_init; struct iwl_init_alive_resp card_alive_init;
struct iwl_alive_resp card_alive; struct iwl_alive_resp card_alive;
#ifdef CONFIG_IWLWIFI_RFKILL #if defined(CONFIG_IWLWIFI_RFKILL) || defined(CONFIG_IWL3945_RFKILL)
struct rfkill *rfkill; struct rfkill *rfkill;
#endif #endif
#ifdef CONFIG_IWLWIFI_LEDS #if defined(CONFIG_IWLWIFI_LEDS) || defined(CONFIG_IWL3945_LEDS)
struct iwl_led led[IWL_LED_TRG_MAX];
unsigned long last_blink_time; unsigned long last_blink_time;
u8 last_blink_rate; u8 last_blink_rate;
u8 allow_blinking; u8 allow_blinking;
u64 led_tpt; u64 led_tpt;
#endif #endif
#ifdef CONFIG_IWLWIFI_LEDS
struct iwl_led led[IWL_LED_TRG_MAX];
#endif
#ifdef CONFIG_IWL3945_LEDS
struct iwl3945_led led39[IWL_LED_TRG_MAX];
unsigned int rxtxpackets;
#endif
u16 active_rate; u16 active_rate;
u16 active_rate_basic; u16 active_rate_basic;
...@@ -1048,12 +1056,16 @@ struct iwl_priv { ...@@ -1048,12 +1056,16 @@ struct iwl_priv {
struct delayed_work init_alive_start; struct delayed_work init_alive_start;
struct delayed_work alive_start; struct delayed_work alive_start;
struct delayed_work scan_check; struct delayed_work scan_check;
/*For 3945 only*/
struct delayed_work thermal_periodic;
/* TX Power */ /* TX Power */
s8 tx_power_user_lmt; s8 tx_power_user_lmt;
s8 tx_power_channel_lmt; s8 tx_power_channel_lmt;
#ifdef CONFIG_IWLWIFI_DEBUG #if defined(CONFIG_IWLWIFI_DEBUG) || defined(CONFIG_IWL3945_DEBUG)
/* debugging info */ /* debugging info */
u32 debug_level; u32 debug_level;
u32 framecnt_to_us; u32 framecnt_to_us;
...@@ -1070,6 +1082,35 @@ struct iwl_priv { ...@@ -1070,6 +1082,35 @@ struct iwl_priv {
u32 disable_tx_power_cal; u32 disable_tx_power_cal;
struct work_struct run_time_calib_work; struct work_struct run_time_calib_work;
struct timer_list statistics_periodic; struct timer_list statistics_periodic;
/*For 3945*/
#define IWL_DEFAULT_TX_POWER 0x0F
s8 user_txpower_limit;
s8 max_channel_txpower_limit;
struct iwl3945_scan_cmd *scan39;
/* We declare this const so it can only be
* changed via explicit cast within the
* routines that actually update the physical
* hardware */
const struct iwl3945_rxon_cmd active39_rxon;
struct iwl3945_rxon_cmd staging39_rxon;
struct iwl3945_rxon_cmd recovery39_rxon;
struct iwl3945_tx_queue txq39[IWL39_MAX_NUM_QUEUES];
struct iwl3945_power_mgr power_data_39;
struct iwl3945_notif_statistics statistics_39;
struct iwl3945_station_entry stations_39[IWL_STATION_COUNT];
/* eeprom */
struct iwl3945_eeprom eeprom39;
u32 sta_supp_rates;
u8 call_post_assoc_from_beacon;
}; /*iwl_priv */ }; /*iwl_priv */
static inline void iwl_txq_ctx_activate(struct iwl_priv *priv, int txq_id) static inline void iwl_txq_ctx_activate(struct iwl_priv *priv, int txq_id)
......
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file @ 4a8a4322
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-dev.h" #include "iwl-dev.h"
static int iwl3945_tx_queue_update_write_ptr(struct iwl3945_priv *priv, static int iwl3945_tx_queue_update_write_ptr(struct iwl_priv *priv,
struct iwl3945_tx_queue *txq); struct iwl3945_tx_queue *txq);
/****************************************************************************** /******************************************************************************
...@@ -103,7 +103,7 @@ MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); ...@@ -103,7 +103,7 @@ MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static const struct ieee80211_supported_band *iwl3945_get_band( static const struct ieee80211_supported_band *iwl3945_get_band(
struct iwl3945_priv *priv, enum ieee80211_band band) struct iwl_priv *priv, enum ieee80211_band band)
{ {
return priv->hw->wiphy->bands[band]; return priv->hw->wiphy->bands[band];
} }
...@@ -143,7 +143,7 @@ int iwl3945_x2_queue_used(const struct iwl_queue *q, int i) ...@@ -143,7 +143,7 @@ int iwl3945_x2_queue_used(const struct iwl_queue *q, int i)
/** /**
* iwl3945_queue_init - Initialize queue's high/low-water and read/write indexes * iwl3945_queue_init - Initialize queue's high/low-water and read/write indexes
*/ */
static int iwl3945_queue_init(struct iwl3945_priv *priv, struct iwl_queue *q, static int iwl3945_queue_init(struct iwl_priv *priv, struct iwl_queue *q,
int count, int slots_num, u32 id) int count, int slots_num, u32 id)
{ {
q->n_bd = count; q->n_bd = count;
...@@ -174,7 +174,7 @@ static int iwl3945_queue_init(struct iwl3945_priv *priv, struct iwl_queue *q, ...@@ -174,7 +174,7 @@ static int iwl3945_queue_init(struct iwl3945_priv *priv, struct iwl_queue *q,
/** /**
* iwl3945_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue * iwl3945_tx_queue_alloc - Alloc driver data and TFD CB for one Tx/cmd queue
*/ */
static int iwl3945_tx_queue_alloc(struct iwl3945_priv *priv, static int iwl3945_tx_queue_alloc(struct iwl_priv *priv,
struct iwl3945_tx_queue *txq, u32 id) struct iwl3945_tx_queue *txq, u32 id)
{ {
struct pci_dev *dev = priv->pci_dev; struct pci_dev *dev = priv->pci_dev;
...@@ -217,7 +217,7 @@ static int iwl3945_tx_queue_alloc(struct iwl3945_priv *priv, ...@@ -217,7 +217,7 @@ static int iwl3945_tx_queue_alloc(struct iwl3945_priv *priv,
/** /**
* iwl3945_tx_queue_init - Allocate and initialize one tx/cmd queue * iwl3945_tx_queue_init - Allocate and initialize one tx/cmd queue
*/ */
int iwl3945_tx_queue_init(struct iwl3945_priv *priv, int iwl3945_tx_queue_init(struct iwl_priv *priv,
struct iwl3945_tx_queue *txq, int slots_num, u32 txq_id) struct iwl3945_tx_queue *txq, int slots_num, u32 txq_id)
{ {
struct pci_dev *dev = priv->pci_dev; struct pci_dev *dev = priv->pci_dev;
...@@ -269,7 +269,7 @@ int iwl3945_tx_queue_init(struct iwl3945_priv *priv, ...@@ -269,7 +269,7 @@ int iwl3945_tx_queue_init(struct iwl3945_priv *priv,
* Free all buffers. * Free all buffers.
* 0-fill, but do not free "txq" descriptor structure. * 0-fill, but do not free "txq" descriptor structure.
*/ */
void iwl3945_tx_queue_free(struct iwl3945_priv *priv, struct iwl3945_tx_queue *txq) void iwl3945_tx_queue_free(struct iwl_priv *priv, struct iwl3945_tx_queue *txq)
{ {
struct iwl_queue *q = &txq->q; struct iwl_queue *q = &txq->q;
struct pci_dev *dev = priv->pci_dev; struct pci_dev *dev = priv->pci_dev;
...@@ -315,7 +315,7 @@ void iwl3945_tx_queue_free(struct iwl3945_priv *priv, struct iwl3945_tx_queue *t ...@@ -315,7 +315,7 @@ void iwl3945_tx_queue_free(struct iwl3945_priv *priv, struct iwl3945_tx_queue *t
* *
* NOTE: This does not remove station from device's station table. * NOTE: This does not remove station from device's station table.
*/ */
static u8 iwl3945_remove_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap) static u8 iwl3945_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
{ {
int index = IWL_INVALID_STATION; int index = IWL_INVALID_STATION;
int i; int i;
...@@ -357,7 +357,7 @@ static u8 iwl3945_remove_station(struct iwl3945_priv *priv, const u8 *addr, int ...@@ -357,7 +357,7 @@ static u8 iwl3945_remove_station(struct iwl3945_priv *priv, const u8 *addr, int
* *
* NOTE: This does not clear or otherwise alter the device's station table. * NOTE: This does not clear or otherwise alter the device's station table.
*/ */
static void iwl3945_clear_stations_table(struct iwl3945_priv *priv) static void iwl3945_clear_stations_table(struct iwl_priv *priv)
{ {
unsigned long flags; unsigned long flags;
...@@ -372,7 +372,7 @@ static void iwl3945_clear_stations_table(struct iwl3945_priv *priv) ...@@ -372,7 +372,7 @@ static void iwl3945_clear_stations_table(struct iwl3945_priv *priv)
/** /**
* iwl3945_add_station - Add station to station tables in driver and device * iwl3945_add_station - Add station to station tables in driver and device
*/ */
u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8 flags) u8 iwl3945_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap, u8 flags)
{ {
int i; int i;
int index = IWL_INVALID_STATION; int index = IWL_INVALID_STATION;
...@@ -442,7 +442,7 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8 ...@@ -442,7 +442,7 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
/*************** DRIVER STATUS FUNCTIONS *****/ /*************** DRIVER STATUS FUNCTIONS *****/
static inline int iwl3945_is_ready(struct iwl3945_priv *priv) static inline int iwl3945_is_ready(struct iwl_priv *priv)
{ {
/* The adapter is 'ready' if READY and GEO_CONFIGURED bits are /* The adapter is 'ready' if READY and GEO_CONFIGURED bits are
* set but EXIT_PENDING is not */ * set but EXIT_PENDING is not */
...@@ -451,33 +451,33 @@ static inline int iwl3945_is_ready(struct iwl3945_priv *priv) ...@@ -451,33 +451,33 @@ static inline int iwl3945_is_ready(struct iwl3945_priv *priv)
!test_bit(STATUS_EXIT_PENDING, &priv->status); !test_bit(STATUS_EXIT_PENDING, &priv->status);
} }
static inline int iwl3945_is_alive(struct iwl3945_priv *priv) static inline int iwl3945_is_alive(struct iwl_priv *priv)
{ {
return test_bit(STATUS_ALIVE, &priv->status); return test_bit(STATUS_ALIVE, &priv->status);
} }
static inline int iwl3945_is_init(struct iwl3945_priv *priv) static inline int iwl3945_is_init(struct iwl_priv *priv)
{ {
return test_bit(STATUS_INIT, &priv->status); return test_bit(STATUS_INIT, &priv->status);
} }
static inline int iwl3945_is_rfkill_sw(struct iwl3945_priv *priv) static inline int iwl3945_is_rfkill_sw(struct iwl_priv *priv)
{ {
return test_bit(STATUS_RF_KILL_SW, &priv->status); return test_bit(STATUS_RF_KILL_SW, &priv->status);
} }
static inline int iwl3945_is_rfkill_hw(struct iwl3945_priv *priv) static inline int iwl3945_is_rfkill_hw(struct iwl_priv *priv)
{ {
return test_bit(STATUS_RF_KILL_HW, &priv->status); return test_bit(STATUS_RF_KILL_HW, &priv->status);
} }
static inline int iwl3945_is_rfkill(struct iwl3945_priv *priv) static inline int iwl3945_is_rfkill(struct iwl_priv *priv)
{ {
return iwl3945_is_rfkill_hw(priv) || return iwl3945_is_rfkill_hw(priv) ||
iwl3945_is_rfkill_sw(priv); iwl3945_is_rfkill_sw(priv);
} }
static inline int iwl3945_is_ready_rf(struct iwl3945_priv *priv) static inline int iwl3945_is_ready_rf(struct iwl_priv *priv)
{ {
if (iwl3945_is_rfkill(priv)) if (iwl3945_is_rfkill(priv))
...@@ -500,7 +500,7 @@ static inline int iwl3945_is_ready_rf(struct iwl3945_priv *priv) ...@@ -500,7 +500,7 @@ static inline int iwl3945_is_ready_rf(struct iwl3945_priv *priv)
* failed. On success, it turns the index (> 0) of command in the * failed. On success, it turns the index (> 0) of command in the
* command queue. * command queue.
*/ */
static int iwl3945_enqueue_hcmd(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd) static int iwl3945_enqueue_hcmd(struct iwl_priv *priv, struct iwl3945_host_cmd *cmd)
{ {
struct iwl3945_tx_queue *txq = &priv->txq39[IWL_CMD_QUEUE_NUM]; struct iwl3945_tx_queue *txq = &priv->txq39[IWL_CMD_QUEUE_NUM];
struct iwl_queue *q = &txq->q; struct iwl_queue *q = &txq->q;
...@@ -579,7 +579,7 @@ static int iwl3945_enqueue_hcmd(struct iwl3945_priv *priv, struct iwl3945_host_c ...@@ -579,7 +579,7 @@ static int iwl3945_enqueue_hcmd(struct iwl3945_priv *priv, struct iwl3945_host_c
return ret ? ret : idx; return ret ? ret : idx;
} }
static int iwl3945_send_cmd_async(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd) static int iwl3945_send_cmd_async(struct iwl_priv *priv, struct iwl3945_host_cmd *cmd)
{ {
int ret; int ret;
...@@ -603,7 +603,7 @@ static int iwl3945_send_cmd_async(struct iwl3945_priv *priv, struct iwl3945_host ...@@ -603,7 +603,7 @@ static int iwl3945_send_cmd_async(struct iwl3945_priv *priv, struct iwl3945_host
return 0; return 0;
} }
static int iwl3945_send_cmd_sync(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd) static int iwl3945_send_cmd_sync(struct iwl_priv *priv, struct iwl3945_host_cmd *cmd)
{ {
int cmd_idx; int cmd_idx;
int ret; int ret;
...@@ -691,7 +691,7 @@ static int iwl3945_send_cmd_sync(struct iwl3945_priv *priv, struct iwl3945_host_ ...@@ -691,7 +691,7 @@ static int iwl3945_send_cmd_sync(struct iwl3945_priv *priv, struct iwl3945_host_
return ret; return ret;
} }
int iwl3945_send_cmd(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd) int iwl3945_send_cmd(struct iwl_priv *priv, struct iwl3945_host_cmd *cmd)
{ {
if (cmd->meta.flags & CMD_ASYNC) if (cmd->meta.flags & CMD_ASYNC)
return iwl3945_send_cmd_async(priv, cmd); return iwl3945_send_cmd_async(priv, cmd);
...@@ -699,7 +699,7 @@ int iwl3945_send_cmd(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd) ...@@ -699,7 +699,7 @@ int iwl3945_send_cmd(struct iwl3945_priv *priv, struct iwl3945_host_cmd *cmd)
return iwl3945_send_cmd_sync(priv, cmd); return iwl3945_send_cmd_sync(priv, cmd);
} }
int iwl3945_send_cmd_pdu(struct iwl3945_priv *priv, u8 id, u16 len, const void *data) int iwl3945_send_cmd_pdu(struct iwl_priv *priv, u8 id, u16 len, const void *data)
{ {
struct iwl3945_host_cmd cmd = { struct iwl3945_host_cmd cmd = {
.id = id, .id = id,
...@@ -710,7 +710,7 @@ int iwl3945_send_cmd_pdu(struct iwl3945_priv *priv, u8 id, u16 len, const void * ...@@ -710,7 +710,7 @@ int iwl3945_send_cmd_pdu(struct iwl3945_priv *priv, u8 id, u16 len, const void *
return iwl3945_send_cmd_sync(priv, &cmd); return iwl3945_send_cmd_sync(priv, &cmd);
} }
static int __must_check iwl3945_send_cmd_u32(struct iwl3945_priv *priv, u8 id, u32 val) static int __must_check iwl3945_send_cmd_u32(struct iwl_priv *priv, u8 id, u32 val)
{ {
struct iwl3945_host_cmd cmd = { struct iwl3945_host_cmd cmd = {
.id = id, .id = id,
...@@ -721,7 +721,7 @@ static int __must_check iwl3945_send_cmd_u32(struct iwl3945_priv *priv, u8 id, u ...@@ -721,7 +721,7 @@ static int __must_check iwl3945_send_cmd_u32(struct iwl3945_priv *priv, u8 id, u
return iwl3945_send_cmd_sync(priv, &cmd); return iwl3945_send_cmd_sync(priv, &cmd);
} }
int iwl3945_send_statistics_request(struct iwl3945_priv *priv) int iwl3945_send_statistics_request(struct iwl_priv *priv)
{ {
return iwl3945_send_cmd_u32(priv, REPLY_STATISTICS_CMD, 0); return iwl3945_send_cmd_u32(priv, REPLY_STATISTICS_CMD, 0);
} }
...@@ -736,7 +736,7 @@ int iwl3945_send_statistics_request(struct iwl3945_priv *priv) ...@@ -736,7 +736,7 @@ int iwl3945_send_statistics_request(struct iwl3945_priv *priv)
* NOTE: Does not commit to the hardware; it sets appropriate bit fields * NOTE: Does not commit to the hardware; it sets appropriate bit fields
* in the staging RXON flag structure based on the band * in the staging RXON flag structure based on the band
*/ */
static int iwl3945_set_rxon_channel(struct iwl3945_priv *priv, static int iwl3945_set_rxon_channel(struct iwl_priv *priv,
enum ieee80211_band band, enum ieee80211_band band,
u16 channel) u16 channel)
{ {
...@@ -770,7 +770,7 @@ static int iwl3945_set_rxon_channel(struct iwl3945_priv *priv, ...@@ -770,7 +770,7 @@ static int iwl3945_set_rxon_channel(struct iwl3945_priv *priv,
* be #ifdef'd out once the driver is stable and folks aren't actively * be #ifdef'd out once the driver is stable and folks aren't actively
* making changes * making changes
*/ */
static int iwl3945_check_rxon_cmd(struct iwl3945_priv *priv) static int iwl3945_check_rxon_cmd(struct iwl_priv *priv)
{ {
int error = 0; int error = 0;
int counter = 1; int counter = 1;
...@@ -851,7 +851,7 @@ static int iwl3945_check_rxon_cmd(struct iwl3945_priv *priv) ...@@ -851,7 +851,7 @@ static int iwl3945_check_rxon_cmd(struct iwl3945_priv *priv)
* or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that * or is clearing the RXON_FILTER_ASSOC_MSK, then return 1 to indicate that
* a new tune (full RXON command, rather than RXON_ASSOC cmd) is required. * a new tune (full RXON command, rather than RXON_ASSOC cmd) is required.
*/ */
static int iwl3945_full_rxon_required(struct iwl3945_priv *priv) static int iwl3945_full_rxon_required(struct iwl_priv *priv)
{ {
/* These items are only settable from the full RXON command */ /* These items are only settable from the full RXON command */
...@@ -886,7 +886,7 @@ static int iwl3945_full_rxon_required(struct iwl3945_priv *priv) ...@@ -886,7 +886,7 @@ static int iwl3945_full_rxon_required(struct iwl3945_priv *priv)
return 0; return 0;
} }
static int iwl3945_send_rxon_assoc(struct iwl3945_priv *priv) static int iwl3945_send_rxon_assoc(struct iwl_priv *priv)
{ {
int rc = 0; int rc = 0;
struct iwl_rx_packet *res = NULL; struct iwl_rx_packet *res = NULL;
...@@ -938,7 +938,7 @@ static int iwl3945_send_rxon_assoc(struct iwl3945_priv *priv) ...@@ -938,7 +938,7 @@ static int iwl3945_send_rxon_assoc(struct iwl3945_priv *priv)
* function correctly transitions out of the RXON_ASSOC_MSK state if * function correctly transitions out of the RXON_ASSOC_MSK state if
* a HW tune is required based on the RXON structure changes. * a HW tune is required based on the RXON structure changes.
*/ */
static int iwl3945_commit_rxon(struct iwl3945_priv *priv) static int iwl3945_commit_rxon(struct iwl_priv *priv)
{ {
/* cast away the const for active_rxon in this function */ /* cast away the const for active_rxon in this function */
struct iwl3945_rxon_cmd *active_rxon = (void *)&priv->active39_rxon; struct iwl3945_rxon_cmd *active_rxon = (void *)&priv->active39_rxon;
...@@ -1056,7 +1056,7 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv) ...@@ -1056,7 +1056,7 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
return 0; return 0;
} }
static int iwl3945_send_bt_config(struct iwl3945_priv *priv) static int iwl3945_send_bt_config(struct iwl_priv *priv)
{ {
struct iwl_bt_cmd bt_cmd = { struct iwl_bt_cmd bt_cmd = {
.flags = 3, .flags = 3,
...@@ -1070,7 +1070,7 @@ static int iwl3945_send_bt_config(struct iwl3945_priv *priv) ...@@ -1070,7 +1070,7 @@ static int iwl3945_send_bt_config(struct iwl3945_priv *priv)
sizeof(bt_cmd), &bt_cmd); sizeof(bt_cmd), &bt_cmd);
} }
static int iwl3945_send_scan_abort(struct iwl3945_priv *priv) static int iwl3945_send_scan_abort(struct iwl_priv *priv)
{ {
int rc = 0; int rc = 0;
struct iwl_rx_packet *res; struct iwl_rx_packet *res;
...@@ -1111,7 +1111,7 @@ static int iwl3945_send_scan_abort(struct iwl3945_priv *priv) ...@@ -1111,7 +1111,7 @@ static int iwl3945_send_scan_abort(struct iwl3945_priv *priv)
return rc; return rc;
} }
static int iwl3945_card_state_sync_callback(struct iwl3945_priv *priv, static int iwl3945_card_state_sync_callback(struct iwl_priv *priv,
struct iwl3945_cmd *cmd, struct iwl3945_cmd *cmd,
struct sk_buff *skb) struct sk_buff *skb)
{ {
...@@ -1128,7 +1128,7 @@ static int iwl3945_card_state_sync_callback(struct iwl3945_priv *priv, ...@@ -1128,7 +1128,7 @@ static int iwl3945_card_state_sync_callback(struct iwl3945_priv *priv,
* When in the 'halt' state, the card is shut down and must be fully * When in the 'halt' state, the card is shut down and must be fully
* restarted to come back on. * restarted to come back on.
*/ */
static int iwl3945_send_card_state(struct iwl3945_priv *priv, u32 flags, u8 meta_flag) static int iwl3945_send_card_state(struct iwl_priv *priv, u32 flags, u8 meta_flag)
{ {
struct iwl3945_host_cmd cmd = { struct iwl3945_host_cmd cmd = {
.id = REPLY_CARD_STATE_CMD, .id = REPLY_CARD_STATE_CMD,
...@@ -1143,7 +1143,7 @@ static int iwl3945_send_card_state(struct iwl3945_priv *priv, u32 flags, u8 meta ...@@ -1143,7 +1143,7 @@ static int iwl3945_send_card_state(struct iwl3945_priv *priv, u32 flags, u8 meta
return iwl3945_send_cmd(priv, &cmd); return iwl3945_send_cmd(priv, &cmd);
} }
static int iwl3945_add_sta_sync_callback(struct iwl3945_priv *priv, static int iwl3945_add_sta_sync_callback(struct iwl_priv *priv,
struct iwl3945_cmd *cmd, struct sk_buff *skb) struct iwl3945_cmd *cmd, struct sk_buff *skb)
{ {
struct iwl_rx_packet *res = NULL; struct iwl_rx_packet *res = NULL;
...@@ -1171,7 +1171,7 @@ static int iwl3945_add_sta_sync_callback(struct iwl3945_priv *priv, ...@@ -1171,7 +1171,7 @@ static int iwl3945_add_sta_sync_callback(struct iwl3945_priv *priv,
return 1; return 1;
} }
int iwl3945_send_add_station(struct iwl3945_priv *priv, int iwl3945_send_add_station(struct iwl_priv *priv,
struct iwl3945_addsta_cmd *sta, u8 flags) struct iwl3945_addsta_cmd *sta, u8 flags)
{ {
struct iwl_rx_packet *res = NULL; struct iwl_rx_packet *res = NULL;
...@@ -1218,7 +1218,7 @@ int iwl3945_send_add_station(struct iwl3945_priv *priv, ...@@ -1218,7 +1218,7 @@ int iwl3945_send_add_station(struct iwl3945_priv *priv,
return rc; return rc;
} }
static int iwl3945_update_sta_key_info(struct iwl3945_priv *priv, static int iwl3945_update_sta_key_info(struct iwl_priv *priv,
struct ieee80211_key_conf *keyconf, struct ieee80211_key_conf *keyconf,
u8 sta_id) u8 sta_id)
{ {
...@@ -1256,7 +1256,7 @@ static int iwl3945_update_sta_key_info(struct iwl3945_priv *priv, ...@@ -1256,7 +1256,7 @@ static int iwl3945_update_sta_key_info(struct iwl3945_priv *priv,
return 0; return 0;
} }
static int iwl3945_clear_sta_key_info(struct iwl3945_priv *priv, u8 sta_id) static int iwl3945_clear_sta_key_info(struct iwl_priv *priv, u8 sta_id)
{ {
unsigned long flags; unsigned long flags;
...@@ -1274,7 +1274,7 @@ static int iwl3945_clear_sta_key_info(struct iwl3945_priv *priv, u8 sta_id) ...@@ -1274,7 +1274,7 @@ static int iwl3945_clear_sta_key_info(struct iwl3945_priv *priv, u8 sta_id)
return 0; return 0;
} }
static void iwl3945_clear_free_frames(struct iwl3945_priv *priv) static void iwl3945_clear_free_frames(struct iwl_priv *priv)
{ {
struct list_head *element; struct list_head *element;
...@@ -1295,7 +1295,7 @@ static void iwl3945_clear_free_frames(struct iwl3945_priv *priv) ...@@ -1295,7 +1295,7 @@ static void iwl3945_clear_free_frames(struct iwl3945_priv *priv)
} }
} }
static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl3945_priv *priv) static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl_priv *priv)
{ {
struct iwl3945_frame *frame; struct iwl3945_frame *frame;
struct list_head *element; struct list_head *element;
...@@ -1315,13 +1315,13 @@ static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl3945_priv *priv) ...@@ -1315,13 +1315,13 @@ static struct iwl3945_frame *iwl3945_get_free_frame(struct iwl3945_priv *priv)
return list_entry(element, struct iwl3945_frame, list); return list_entry(element, struct iwl3945_frame, list);
} }
static void iwl3945_free_frame(struct iwl3945_priv *priv, struct iwl3945_frame *frame) static void iwl3945_free_frame(struct iwl_priv *priv, struct iwl3945_frame *frame)
{ {
memset(frame, 0, sizeof(*frame)); memset(frame, 0, sizeof(*frame));
list_add(&frame->list, &priv->free_frames); list_add(&frame->list, &priv->free_frames);
} }
unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv, unsigned int iwl3945_fill_beacon_frame(struct iwl_priv *priv,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
int left) int left)
{ {
...@@ -1339,7 +1339,7 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv, ...@@ -1339,7 +1339,7 @@ unsigned int iwl3945_fill_beacon_frame(struct iwl3945_priv *priv,
return priv->ibss_beacon->len; return priv->ibss_beacon->len;
} }
static u8 iwl3945_rate_get_lowest_plcp(struct iwl3945_priv *priv) static u8 iwl3945_rate_get_lowest_plcp(struct iwl_priv *priv)
{ {
u8 i; u8 i;
int rate_mask; int rate_mask;
...@@ -1363,7 +1363,7 @@ static u8 iwl3945_rate_get_lowest_plcp(struct iwl3945_priv *priv) ...@@ -1363,7 +1363,7 @@ static u8 iwl3945_rate_get_lowest_plcp(struct iwl3945_priv *priv)
return IWL_RATE_6M_PLCP; return IWL_RATE_6M_PLCP;
} }
static int iwl3945_send_beacon_cmd(struct iwl3945_priv *priv) static int iwl3945_send_beacon_cmd(struct iwl_priv *priv)
{ {
struct iwl3945_frame *frame; struct iwl3945_frame *frame;
unsigned int frame_size; unsigned int frame_size;
...@@ -1396,7 +1396,7 @@ static int iwl3945_send_beacon_cmd(struct iwl3945_priv *priv) ...@@ -1396,7 +1396,7 @@ static int iwl3945_send_beacon_cmd(struct iwl3945_priv *priv)
* *
******************************************************************************/ ******************************************************************************/
static void get_eeprom_mac(struct iwl3945_priv *priv, u8 *mac) static void get_eeprom_mac(struct iwl_priv *priv, u8 *mac)
{ {
memcpy(mac, priv->eeprom39.mac_address, 6); memcpy(mac, priv->eeprom39.mac_address, 6);
} }
...@@ -1409,7 +1409,7 @@ static void get_eeprom_mac(struct iwl3945_priv *priv, u8 *mac) ...@@ -1409,7 +1409,7 @@ static void get_eeprom_mac(struct iwl3945_priv *priv, u8 *mac)
* simply claims ownership, which should be safe when this function is called * simply claims ownership, which should be safe when this function is called
* (i.e. before loading uCode!). * (i.e. before loading uCode!).
*/ */
static inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv) static inline int iwl3945_eeprom_acquire_semaphore(struct iwl_priv *priv)
{ {
_iwl3945_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK); _iwl3945_clear_bit(priv, CSR_EEPROM_GP, CSR_EEPROM_GP_IF_OWNER_MSK);
return 0; return 0;
...@@ -1422,7 +1422,7 @@ static inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv) ...@@ -1422,7 +1422,7 @@ static inline int iwl3945_eeprom_acquire_semaphore(struct iwl3945_priv *priv)
* *
* NOTE: This routine uses the non-debug IO access functions. * NOTE: This routine uses the non-debug IO access functions.
*/ */
int iwl3945_eeprom_init(struct iwl3945_priv *priv) int iwl3945_eeprom_init(struct iwl_priv *priv)
{ {
u16 *e = (u16 *)&priv->eeprom39; u16 *e = (u16 *)&priv->eeprom39;
u32 gp = iwl3945_read32(priv, CSR_EEPROM_GP); u32 gp = iwl3945_read32(priv, CSR_EEPROM_GP);
...@@ -1470,7 +1470,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv) ...@@ -1470,7 +1470,7 @@ int iwl3945_eeprom_init(struct iwl3945_priv *priv)
return 0; return 0;
} }
static void iwl3945_unset_hw_params(struct iwl3945_priv *priv) static void iwl3945_unset_hw_params(struct iwl_priv *priv)
{ {
if (priv->shared_virt) if (priv->shared_virt)
pci_free_consistent(priv->pci_dev, pci_free_consistent(priv->pci_dev,
...@@ -1511,7 +1511,7 @@ static u16 iwl3945_supported_rate_to_ie(u8 *ie, u16 supported_rate, ...@@ -1511,7 +1511,7 @@ static u16 iwl3945_supported_rate_to_ie(u8 *ie, u16 supported_rate,
/** /**
* iwl3945_fill_probe_req - fill in all required fields and IE for probe request * iwl3945_fill_probe_req - fill in all required fields and IE for probe request
*/ */
static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv, static u16 iwl3945_fill_probe_req(struct iwl_priv *priv,
struct ieee80211_mgmt *frame, struct ieee80211_mgmt *frame,
int left) int left)
{ {
...@@ -1591,7 +1591,7 @@ static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv, ...@@ -1591,7 +1591,7 @@ static u16 iwl3945_fill_probe_req(struct iwl3945_priv *priv,
/* /*
* QoS support * QoS support
*/ */
static int iwl3945_send_qos_params_command(struct iwl3945_priv *priv, static int iwl3945_send_qos_params_command(struct iwl_priv *priv,
struct iwl_qosparam_cmd *qos) struct iwl_qosparam_cmd *qos)
{ {
...@@ -1599,7 +1599,7 @@ static int iwl3945_send_qos_params_command(struct iwl3945_priv *priv, ...@@ -1599,7 +1599,7 @@ static int iwl3945_send_qos_params_command(struct iwl3945_priv *priv,
sizeof(struct iwl_qosparam_cmd), qos); sizeof(struct iwl_qosparam_cmd), qos);
} }
static void iwl3945_reset_qos(struct iwl3945_priv *priv) static void iwl3945_reset_qos(struct iwl_priv *priv)
{ {
u16 cw_min = 15; u16 cw_min = 15;
u16 cw_max = 1023; u16 cw_max = 1023;
...@@ -1690,7 +1690,7 @@ static void iwl3945_reset_qos(struct iwl3945_priv *priv) ...@@ -1690,7 +1690,7 @@ static void iwl3945_reset_qos(struct iwl3945_priv *priv)
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
static void iwl3945_activate_qos(struct iwl3945_priv *priv, u8 force) static void iwl3945_activate_qos(struct iwl_priv *priv, u8 force)
{ {
unsigned long flags; unsigned long flags;
...@@ -1760,7 +1760,7 @@ static struct iwl_power_vec_entry range_1[IWL39_POWER_AC] = { ...@@ -1760,7 +1760,7 @@ static struct iwl_power_vec_entry range_1[IWL39_POWER_AC] = {
SLP_VEC(4, 7, 10, 10, 0xFF)}, 0} SLP_VEC(4, 7, 10, 10, 0xFF)}, 0}
}; };
int iwl3945_power_init_handle(struct iwl3945_priv *priv) int iwl3945_power_init_handle(struct iwl_priv *priv)
{ {
int rc = 0, i; int rc = 0, i;
struct iwl3945_power_mgr *pow_data; struct iwl3945_power_mgr *pow_data;
...@@ -1799,7 +1799,7 @@ int iwl3945_power_init_handle(struct iwl3945_priv *priv) ...@@ -1799,7 +1799,7 @@ int iwl3945_power_init_handle(struct iwl3945_priv *priv)
return rc; return rc;
} }
static int iwl3945_update_power_cmd(struct iwl3945_priv *priv, static int iwl3945_update_power_cmd(struct iwl_priv *priv,
struct iwl_powertable_cmd *cmd, u32 mode) struct iwl_powertable_cmd *cmd, u32 mode)
{ {
int rc = 0, i; int rc = 0, i;
...@@ -1863,7 +1863,7 @@ static int iwl3945_update_power_cmd(struct iwl3945_priv *priv, ...@@ -1863,7 +1863,7 @@ static int iwl3945_update_power_cmd(struct iwl3945_priv *priv,
return rc; return rc;
} }
static int iwl3945_send_power_mode(struct iwl3945_priv *priv, u32 mode) static int iwl3945_send_power_mode(struct iwl_priv *priv, u32 mode)
{ {
u32 uninitialized_var(final_mode); u32 uninitialized_var(final_mode);
int rc; int rc;
...@@ -1903,7 +1903,7 @@ static int iwl3945_send_power_mode(struct iwl3945_priv *priv, u32 mode) ...@@ -1903,7 +1903,7 @@ static int iwl3945_send_power_mode(struct iwl3945_priv *priv, u32 mode)
* *
* NOTE: priv->mutex is not required before calling this function * NOTE: priv->mutex is not required before calling this function
*/ */
static int iwl3945_scan_cancel(struct iwl3945_priv *priv) static int iwl3945_scan_cancel(struct iwl_priv *priv)
{ {
if (!test_bit(STATUS_SCAN_HW, &priv->status)) { if (!test_bit(STATUS_SCAN_HW, &priv->status)) {
clear_bit(STATUS_SCANNING, &priv->status); clear_bit(STATUS_SCANNING, &priv->status);
...@@ -1931,7 +1931,7 @@ static int iwl3945_scan_cancel(struct iwl3945_priv *priv) ...@@ -1931,7 +1931,7 @@ static int iwl3945_scan_cancel(struct iwl3945_priv *priv)
* *
* NOTE: priv->mutex must be held before calling this function * NOTE: priv->mutex must be held before calling this function
*/ */
static int iwl3945_scan_cancel_timeout(struct iwl3945_priv *priv, unsigned long ms) static int iwl3945_scan_cancel_timeout(struct iwl_priv *priv, unsigned long ms)
{ {
unsigned long now = jiffies; unsigned long now = jiffies;
int ret; int ret;
...@@ -1966,7 +1966,7 @@ static __le16 iwl3945_adjust_beacon_interval(u16 beacon_val) ...@@ -1966,7 +1966,7 @@ static __le16 iwl3945_adjust_beacon_interval(u16 beacon_val)
return cpu_to_le16(new_val); return cpu_to_le16(new_val);
} }
static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv) static void iwl3945_setup_rxon_timing(struct iwl_priv *priv)
{ {
u64 interval_tm_unit; u64 interval_tm_unit;
u64 tsf, result; u64 tsf, result;
...@@ -2019,7 +2019,7 @@ static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv) ...@@ -2019,7 +2019,7 @@ static void iwl3945_setup_rxon_timing(struct iwl3945_priv *priv)
le16_to_cpu(priv->rxon_timing.atim_window)); le16_to_cpu(priv->rxon_timing.atim_window));
} }
static int iwl3945_scan_initiate(struct iwl3945_priv *priv) static int iwl3945_scan_initiate(struct iwl_priv *priv)
{ {
if (!iwl3945_is_ready_rf(priv)) { if (!iwl3945_is_ready_rf(priv)) {
IWL_DEBUG_SCAN("Aborting scan due to not ready.\n"); IWL_DEBUG_SCAN("Aborting scan due to not ready.\n");
...@@ -2051,7 +2051,7 @@ static int iwl3945_scan_initiate(struct iwl3945_priv *priv) ...@@ -2051,7 +2051,7 @@ static int iwl3945_scan_initiate(struct iwl3945_priv *priv)
return 0; return 0;
} }
static int iwl3945_set_rxon_hwcrypto(struct iwl3945_priv *priv, int hw_decrypt) static int iwl3945_set_rxon_hwcrypto(struct iwl_priv *priv, int hw_decrypt)
{ {
struct iwl3945_rxon_cmd *rxon = &priv->staging39_rxon; struct iwl3945_rxon_cmd *rxon = &priv->staging39_rxon;
...@@ -2063,7 +2063,7 @@ static int iwl3945_set_rxon_hwcrypto(struct iwl3945_priv *priv, int hw_decrypt) ...@@ -2063,7 +2063,7 @@ static int iwl3945_set_rxon_hwcrypto(struct iwl3945_priv *priv, int hw_decrypt)
return 0; return 0;
} }
static void iwl3945_set_flags_for_phymode(struct iwl3945_priv *priv, static void iwl3945_set_flags_for_phymode(struct iwl_priv *priv,
enum ieee80211_band band) enum ieee80211_band band)
{ {
if (band == IEEE80211_BAND_5GHZ) { if (band == IEEE80211_BAND_5GHZ) {
...@@ -2090,7 +2090,7 @@ static void iwl3945_set_flags_for_phymode(struct iwl3945_priv *priv, ...@@ -2090,7 +2090,7 @@ static void iwl3945_set_flags_for_phymode(struct iwl3945_priv *priv,
/* /*
* initialize rxon structure with default values from eeprom * initialize rxon structure with default values from eeprom
*/ */
static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv, static void iwl3945_connection_init_rx_config(struct iwl_priv *priv,
int mode) int mode)
{ {
const struct iwl_channel_info *ch_info; const struct iwl_channel_info *ch_info;
...@@ -2160,7 +2160,7 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv, ...@@ -2160,7 +2160,7 @@ static void iwl3945_connection_init_rx_config(struct iwl3945_priv *priv,
(IWL_CCK_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF; (IWL_CCK_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;
} }
static int iwl3945_set_mode(struct iwl3945_priv *priv, int mode) static int iwl3945_set_mode(struct iwl_priv *priv, int mode)
{ {
if (mode == NL80211_IFTYPE_ADHOC) { if (mode == NL80211_IFTYPE_ADHOC) {
const struct iwl_channel_info *ch_info; const struct iwl_channel_info *ch_info;
...@@ -2197,7 +2197,7 @@ static int iwl3945_set_mode(struct iwl3945_priv *priv, int mode) ...@@ -2197,7 +2197,7 @@ static int iwl3945_set_mode(struct iwl3945_priv *priv, int mode)
return 0; return 0;
} }
static void iwl3945_build_tx_cmd_hwcrypto(struct iwl3945_priv *priv, static void iwl3945_build_tx_cmd_hwcrypto(struct iwl_priv *priv,
struct ieee80211_tx_info *info, struct ieee80211_tx_info *info,
struct iwl3945_cmd *cmd, struct iwl3945_cmd *cmd,
struct sk_buff *skb_frag, struct sk_buff *skb_frag,
...@@ -2247,7 +2247,7 @@ static void iwl3945_build_tx_cmd_hwcrypto(struct iwl3945_priv *priv, ...@@ -2247,7 +2247,7 @@ static void iwl3945_build_tx_cmd_hwcrypto(struct iwl3945_priv *priv,
/* /*
* handle build REPLY_TX command notification. * handle build REPLY_TX command notification.
*/ */
static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv, static void iwl3945_build_tx_cmd_basic(struct iwl_priv *priv,
struct iwl3945_cmd *cmd, struct iwl3945_cmd *cmd,
struct ieee80211_tx_info *info, struct ieee80211_tx_info *info,
struct ieee80211_hdr *hdr, struct ieee80211_hdr *hdr,
...@@ -2314,7 +2314,7 @@ static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv, ...@@ -2314,7 +2314,7 @@ static void iwl3945_build_tx_cmd_basic(struct iwl3945_priv *priv,
/** /**
* iwl3945_get_sta_id - Find station's index within station table * iwl3945_get_sta_id - Find station's index within station table
*/ */
static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *hdr) static int iwl3945_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
{ {
int sta_id; int sta_id;
u16 fc = le16_to_cpu(hdr->frame_control); u16 fc = le16_to_cpu(hdr->frame_control);
...@@ -2371,7 +2371,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h ...@@ -2371,7 +2371,7 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
/* /*
* start REPLY_TX command process * start REPLY_TX command process
*/ */
static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb) static int iwl3945_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
{ {
struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data; struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
...@@ -2594,7 +2594,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb) ...@@ -2594,7 +2594,7 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
return -1; return -1;
} }
static void iwl3945_set_rate(struct iwl3945_priv *priv) static void iwl3945_set_rate(struct iwl_priv *priv)
{ {
const struct ieee80211_supported_band *sband = NULL; const struct ieee80211_supported_band *sband = NULL;
struct ieee80211_rate *rate; struct ieee80211_rate *rate;
...@@ -2648,7 +2648,7 @@ static void iwl3945_set_rate(struct iwl3945_priv *priv) ...@@ -2648,7 +2648,7 @@ static void iwl3945_set_rate(struct iwl3945_priv *priv)
(IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF; (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
} }
static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio) static void iwl3945_radio_kill_sw(struct iwl_priv *priv, int disable_radio)
{ {
unsigned long flags; unsigned long flags;
...@@ -2698,7 +2698,7 @@ static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio) ...@@ -2698,7 +2698,7 @@ static void iwl3945_radio_kill_sw(struct iwl3945_priv *priv, int disable_radio)
return; return;
} }
void iwl3945_set_decrypted_flag(struct iwl3945_priv *priv, struct sk_buff *skb, void iwl3945_set_decrypted_flag(struct iwl_priv *priv, struct sk_buff *skb,
u32 decrypt_res, struct ieee80211_rx_status *stats) u32 decrypt_res, struct ieee80211_rx_status *stats)
{ {
u16 fc = u16 fc =
...@@ -2783,7 +2783,7 @@ static __le32 iwl3945_add_beacon_time(u32 base, u32 addon, u32 beacon_interval) ...@@ -2783,7 +2783,7 @@ static __le32 iwl3945_add_beacon_time(u32 base, u32 addon, u32 beacon_interval)
return cpu_to_le32(res); return cpu_to_le32(res);
} }
static int iwl3945_get_measurement(struct iwl3945_priv *priv, static int iwl3945_get_measurement(struct iwl_priv *priv,
struct ieee80211_measurement_params *params, struct ieee80211_measurement_params *params,
u8 type) u8 type)
{ {
...@@ -2862,7 +2862,7 @@ static int iwl3945_get_measurement(struct iwl3945_priv *priv, ...@@ -2862,7 +2862,7 @@ static int iwl3945_get_measurement(struct iwl3945_priv *priv,
} }
#endif #endif
static void iwl3945_rx_reply_alive(struct iwl3945_priv *priv, static void iwl3945_rx_reply_alive(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -2898,7 +2898,7 @@ static void iwl3945_rx_reply_alive(struct iwl3945_priv *priv, ...@@ -2898,7 +2898,7 @@ static void iwl3945_rx_reply_alive(struct iwl3945_priv *priv,
IWL_WARNING("uCode did not respond OK.\n"); IWL_WARNING("uCode did not respond OK.\n");
} }
static void iwl3945_rx_reply_add_sta(struct iwl3945_priv *priv, static void iwl3945_rx_reply_add_sta(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -2907,7 +2907,7 @@ static void iwl3945_rx_reply_add_sta(struct iwl3945_priv *priv, ...@@ -2907,7 +2907,7 @@ static void iwl3945_rx_reply_add_sta(struct iwl3945_priv *priv,
return; return;
} }
static void iwl3945_rx_reply_error(struct iwl3945_priv *priv, static void iwl3945_rx_reply_error(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -2923,7 +2923,7 @@ static void iwl3945_rx_reply_error(struct iwl3945_priv *priv, ...@@ -2923,7 +2923,7 @@ static void iwl3945_rx_reply_error(struct iwl3945_priv *priv,
#define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x #define TX_STATUS_ENTRY(x) case TX_STATUS_FAIL_ ## x: return #x
static void iwl3945_rx_csa(struct iwl3945_priv *priv, struct iwl_rx_mem_buffer *rxb) static void iwl3945_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
struct iwl3945_rxon_cmd *rxon = (void *)&priv->active39_rxon; struct iwl3945_rxon_cmd *rxon = (void *)&priv->active39_rxon;
...@@ -2934,7 +2934,7 @@ static void iwl3945_rx_csa(struct iwl3945_priv *priv, struct iwl_rx_mem_buffer * ...@@ -2934,7 +2934,7 @@ static void iwl3945_rx_csa(struct iwl3945_priv *priv, struct iwl_rx_mem_buffer *
priv->staging39_rxon.channel = csa->channel; priv->staging39_rxon.channel = csa->channel;
} }
static void iwl3945_rx_spectrum_measure_notif(struct iwl3945_priv *priv, static void iwl3945_rx_spectrum_measure_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
#ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT #ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
...@@ -2952,7 +2952,7 @@ static void iwl3945_rx_spectrum_measure_notif(struct iwl3945_priv *priv, ...@@ -2952,7 +2952,7 @@ static void iwl3945_rx_spectrum_measure_notif(struct iwl3945_priv *priv,
#endif #endif
} }
static void iwl3945_rx_pm_sleep_notif(struct iwl3945_priv *priv, static void iwl3945_rx_pm_sleep_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
...@@ -2963,7 +2963,7 @@ static void iwl3945_rx_pm_sleep_notif(struct iwl3945_priv *priv, ...@@ -2963,7 +2963,7 @@ static void iwl3945_rx_pm_sleep_notif(struct iwl3945_priv *priv,
#endif #endif
} }
static void iwl3945_rx_pm_debug_statistics_notif(struct iwl3945_priv *priv, static void iwl3945_rx_pm_debug_statistics_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -2976,8 +2976,8 @@ static void iwl3945_rx_pm_debug_statistics_notif(struct iwl3945_priv *priv, ...@@ -2976,8 +2976,8 @@ static void iwl3945_rx_pm_debug_statistics_notif(struct iwl3945_priv *priv,
static void iwl3945_bg_beacon_update(struct work_struct *work) static void iwl3945_bg_beacon_update(struct work_struct *work)
{ {
struct iwl3945_priv *priv = struct iwl_priv *priv =
container_of(work, struct iwl3945_priv, beacon_update); container_of(work, struct iwl_priv, beacon_update);
struct sk_buff *beacon; struct sk_buff *beacon;
/* Pull updated AP beacon from mac80211. will fail if not in AP mode */ /* Pull updated AP beacon from mac80211. will fail if not in AP mode */
...@@ -2999,7 +2999,7 @@ static void iwl3945_bg_beacon_update(struct work_struct *work) ...@@ -2999,7 +2999,7 @@ static void iwl3945_bg_beacon_update(struct work_struct *work)
iwl3945_send_beacon_cmd(priv); iwl3945_send_beacon_cmd(priv);
} }
static void iwl3945_rx_beacon_notif(struct iwl3945_priv *priv, static void iwl3945_rx_beacon_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
...@@ -3022,7 +3022,7 @@ static void iwl3945_rx_beacon_notif(struct iwl3945_priv *priv, ...@@ -3022,7 +3022,7 @@ static void iwl3945_rx_beacon_notif(struct iwl3945_priv *priv,
} }
/* Service response to REPLY_SCAN_CMD (0x80) */ /* Service response to REPLY_SCAN_CMD (0x80) */
static void iwl3945_rx_reply_scan(struct iwl3945_priv *priv, static void iwl3945_rx_reply_scan(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
...@@ -3035,7 +3035,7 @@ static void iwl3945_rx_reply_scan(struct iwl3945_priv *priv, ...@@ -3035,7 +3035,7 @@ static void iwl3945_rx_reply_scan(struct iwl3945_priv *priv,
} }
/* Service SCAN_START_NOTIFICATION (0x82) */ /* Service SCAN_START_NOTIFICATION (0x82) */
static void iwl3945_rx_scan_start_notif(struct iwl3945_priv *priv, static void iwl3945_rx_scan_start_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -3052,7 +3052,7 @@ static void iwl3945_rx_scan_start_notif(struct iwl3945_priv *priv, ...@@ -3052,7 +3052,7 @@ static void iwl3945_rx_scan_start_notif(struct iwl3945_priv *priv,
} }
/* Service SCAN_RESULTS_NOTIFICATION (0x83) */ /* Service SCAN_RESULTS_NOTIFICATION (0x83) */
static void iwl3945_rx_scan_results_notif(struct iwl3945_priv *priv, static void iwl3945_rx_scan_results_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -3077,7 +3077,7 @@ static void iwl3945_rx_scan_results_notif(struct iwl3945_priv *priv, ...@@ -3077,7 +3077,7 @@ static void iwl3945_rx_scan_results_notif(struct iwl3945_priv *priv,
} }
/* Service SCAN_COMPLETE_NOTIFICATION (0x84) */ /* Service SCAN_COMPLETE_NOTIFICATION (0x84) */
static void iwl3945_rx_scan_complete_notif(struct iwl3945_priv *priv, static void iwl3945_rx_scan_complete_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -3140,7 +3140,7 @@ static void iwl3945_rx_scan_complete_notif(struct iwl3945_priv *priv, ...@@ -3140,7 +3140,7 @@ static void iwl3945_rx_scan_complete_notif(struct iwl3945_priv *priv,
/* Handle notification from uCode that card's power state is changing /* Handle notification from uCode that card's power state is changing
* due to software, hardware, or critical temperature RFKILL */ * due to software, hardware, or critical temperature RFKILL */
static void iwl3945_rx_card_state_notif(struct iwl3945_priv *priv, static void iwl3945_rx_card_state_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
...@@ -3185,7 +3185,7 @@ static void iwl3945_rx_card_state_notif(struct iwl3945_priv *priv, ...@@ -3185,7 +3185,7 @@ static void iwl3945_rx_card_state_notif(struct iwl3945_priv *priv,
* This function chains into the hardware specific files for them to setup * This function chains into the hardware specific files for them to setup
* any hardware specific handlers as well. * any hardware specific handlers as well.
*/ */
static void iwl3945_setup_rx_handlers(struct iwl3945_priv *priv) static void iwl3945_setup_rx_handlers(struct iwl_priv *priv)
{ {
priv->rx_handlers[REPLY_ALIVE] = iwl3945_rx_reply_alive; priv->rx_handlers[REPLY_ALIVE] = iwl3945_rx_reply_alive;
priv->rx_handlers[REPLY_ADD_STA] = iwl3945_rx_reply_add_sta; priv->rx_handlers[REPLY_ADD_STA] = iwl3945_rx_reply_add_sta;
...@@ -3223,7 +3223,7 @@ static void iwl3945_setup_rx_handlers(struct iwl3945_priv *priv) ...@@ -3223,7 +3223,7 @@ static void iwl3945_setup_rx_handlers(struct iwl3945_priv *priv)
* When FW advances 'R' index, all entries between old and new 'R' index * When FW advances 'R' index, all entries between old and new 'R' index
* need to be reclaimed. * need to be reclaimed.
*/ */
static void iwl3945_cmd_queue_reclaim(struct iwl3945_priv *priv, static void iwl3945_cmd_queue_reclaim(struct iwl_priv *priv,
int txq_id, int index) int txq_id, int index)
{ {
struct iwl3945_tx_queue *txq = &priv->txq39[txq_id]; struct iwl3945_tx_queue *txq = &priv->txq39[txq_id];
...@@ -3258,7 +3258,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl3945_priv *priv, ...@@ -3258,7 +3258,7 @@ static void iwl3945_cmd_queue_reclaim(struct iwl3945_priv *priv,
* will be executed. The attached skb (if present) will only be freed * will be executed. The attached skb (if present) will only be freed
* if the callback returns 1 * if the callback returns 1
*/ */
static void iwl3945_tx_cmd_complete(struct iwl3945_priv *priv, static void iwl3945_tx_cmd_complete(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data; struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;
...@@ -3373,7 +3373,7 @@ static int iwl3945_rx_queue_space(const struct iwl_rx_queue *q) ...@@ -3373,7 +3373,7 @@ static int iwl3945_rx_queue_space(const struct iwl_rx_queue *q)
/** /**
* iwl3945_rx_queue_update_write_ptr - Update the write pointer for the RX queue * iwl3945_rx_queue_update_write_ptr - Update the write pointer for the RX queue
*/ */
int iwl3945_rx_queue_update_write_ptr(struct iwl3945_priv *priv, struct iwl_rx_queue *q) int iwl3945_rx_queue_update_write_ptr(struct iwl_priv *priv, struct iwl_rx_queue *q)
{ {
u32 reg = 0; u32 reg = 0;
int rc = 0; int rc = 0;
...@@ -3419,7 +3419,7 @@ int iwl3945_rx_queue_update_write_ptr(struct iwl3945_priv *priv, struct iwl_rx_q ...@@ -3419,7 +3419,7 @@ int iwl3945_rx_queue_update_write_ptr(struct iwl3945_priv *priv, struct iwl_rx_q
/** /**
* iwl3945_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr * iwl3945_dma_addr2rbd_ptr - convert a DMA address to a uCode read buffer ptr
*/ */
static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl3945_priv *priv, static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl_priv *priv,
dma_addr_t dma_addr) dma_addr_t dma_addr)
{ {
return cpu_to_le32((u32)dma_addr); return cpu_to_le32((u32)dma_addr);
...@@ -3436,7 +3436,7 @@ static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl3945_priv *priv, ...@@ -3436,7 +3436,7 @@ static inline __le32 iwl3945_dma_addr2rbd_ptr(struct iwl3945_priv *priv,
* also updates the memory address in the firmware to reference the new * also updates the memory address in the firmware to reference the new
* target buffer. * target buffer.
*/ */
static int iwl3945_rx_queue_restock(struct iwl3945_priv *priv) static int iwl3945_rx_queue_restock(struct iwl_priv *priv)
{ {
struct iwl_rx_queue *rxq = &priv->rxq; struct iwl_rx_queue *rxq = &priv->rxq;
struct list_head *element; struct list_head *element;
...@@ -3488,7 +3488,7 @@ static int iwl3945_rx_queue_restock(struct iwl3945_priv *priv) ...@@ -3488,7 +3488,7 @@ static int iwl3945_rx_queue_restock(struct iwl3945_priv *priv)
* Also restock the Rx queue via iwl3945_rx_queue_restock. * Also restock the Rx queue via iwl3945_rx_queue_restock.
* This is called as a scheduled work item (except for during initialization) * This is called as a scheduled work item (except for during initialization)
*/ */
static void iwl3945_rx_allocate(struct iwl3945_priv *priv) static void iwl3945_rx_allocate(struct iwl_priv *priv)
{ {
struct iwl_rx_queue *rxq = &priv->rxq; struct iwl_rx_queue *rxq = &priv->rxq;
struct list_head *element; struct list_head *element;
...@@ -3538,7 +3538,7 @@ static void iwl3945_rx_allocate(struct iwl3945_priv *priv) ...@@ -3538,7 +3538,7 @@ static void iwl3945_rx_allocate(struct iwl3945_priv *priv)
*/ */
static void __iwl3945_rx_replenish(void *data) static void __iwl3945_rx_replenish(void *data)
{ {
struct iwl3945_priv *priv = data; struct iwl_priv *priv = data;
iwl3945_rx_allocate(priv); iwl3945_rx_allocate(priv);
iwl3945_rx_queue_restock(priv); iwl3945_rx_queue_restock(priv);
...@@ -3547,7 +3547,7 @@ static void __iwl3945_rx_replenish(void *data) ...@@ -3547,7 +3547,7 @@ static void __iwl3945_rx_replenish(void *data)
void iwl3945_rx_replenish(void *data) void iwl3945_rx_replenish(void *data)
{ {
struct iwl3945_priv *priv = data; struct iwl_priv *priv = data;
unsigned long flags; unsigned long flags;
iwl3945_rx_allocate(priv); iwl3945_rx_allocate(priv);
...@@ -3562,7 +3562,7 @@ void iwl3945_rx_replenish(void *data) ...@@ -3562,7 +3562,7 @@ void iwl3945_rx_replenish(void *data)
* This free routine walks the list of POOL entries and if SKB is set to * This free routine walks the list of POOL entries and if SKB is set to
* non NULL it is unmapped and freed * non NULL it is unmapped and freed
*/ */
static void iwl3945_rx_queue_free(struct iwl3945_priv *priv, struct iwl_rx_queue *rxq) static void iwl3945_rx_queue_free(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
{ {
int i; int i;
for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) { for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) {
...@@ -3579,7 +3579,7 @@ static void iwl3945_rx_queue_free(struct iwl3945_priv *priv, struct iwl_rx_queue ...@@ -3579,7 +3579,7 @@ static void iwl3945_rx_queue_free(struct iwl3945_priv *priv, struct iwl_rx_queue
rxq->bd = NULL; rxq->bd = NULL;
} }
int iwl3945_rx_queue_alloc(struct iwl3945_priv *priv) int iwl3945_rx_queue_alloc(struct iwl_priv *priv)
{ {
struct iwl_rx_queue *rxq = &priv->rxq; struct iwl_rx_queue *rxq = &priv->rxq;
struct pci_dev *dev = priv->pci_dev; struct pci_dev *dev = priv->pci_dev;
...@@ -3606,7 +3606,7 @@ int iwl3945_rx_queue_alloc(struct iwl3945_priv *priv) ...@@ -3606,7 +3606,7 @@ int iwl3945_rx_queue_alloc(struct iwl3945_priv *priv)
return 0; return 0;
} }
void iwl3945_rx_queue_reset(struct iwl3945_priv *priv, struct iwl_rx_queue *rxq) void iwl3945_rx_queue_reset(struct iwl_priv *priv, struct iwl_rx_queue *rxq)
{ {
unsigned long flags; unsigned long flags;
int i; int i;
...@@ -3720,7 +3720,7 @@ int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm) ...@@ -3720,7 +3720,7 @@ int iwl3945_calc_sig_qual(int rssi_dbm, int noise_dbm)
* the appropriate handlers, including command responses, * the appropriate handlers, including command responses,
* frame-received notifications, and other notifications. * frame-received notifications, and other notifications.
*/ */
static void iwl3945_rx_handle(struct iwl3945_priv *priv) static void iwl3945_rx_handle(struct iwl_priv *priv)
{ {
struct iwl_rx_mem_buffer *rxb; struct iwl_rx_mem_buffer *rxb;
struct iwl_rx_packet *pkt; struct iwl_rx_packet *pkt;
...@@ -3828,7 +3828,7 @@ static void iwl3945_rx_handle(struct iwl3945_priv *priv) ...@@ -3828,7 +3828,7 @@ static void iwl3945_rx_handle(struct iwl3945_priv *priv)
/** /**
* iwl3945_tx_queue_update_write_ptr - Send new write index to hardware * iwl3945_tx_queue_update_write_ptr - Send new write index to hardware
*/ */
static int iwl3945_tx_queue_update_write_ptr(struct iwl3945_priv *priv, static int iwl3945_tx_queue_update_write_ptr(struct iwl_priv *priv,
struct iwl3945_tx_queue *txq) struct iwl3945_tx_queue *txq)
{ {
u32 reg = 0; u32 reg = 0;
...@@ -3872,7 +3872,7 @@ static int iwl3945_tx_queue_update_write_ptr(struct iwl3945_priv *priv, ...@@ -3872,7 +3872,7 @@ static int iwl3945_tx_queue_update_write_ptr(struct iwl3945_priv *priv,
} }
#ifdef CONFIG_IWL3945_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static void iwl3945_print_rx_config_cmd(struct iwl3945_priv *priv, static void iwl3945_print_rx_config_cmd(struct iwl_priv *priv,
struct iwl3945_rxon_cmd *rxon) struct iwl3945_rxon_cmd *rxon)
{ {
IWL_DEBUG_RADIO("RX CONFIG:\n"); IWL_DEBUG_RADIO("RX CONFIG:\n");
...@@ -3891,7 +3891,7 @@ static void iwl3945_print_rx_config_cmd(struct iwl3945_priv *priv, ...@@ -3891,7 +3891,7 @@ static void iwl3945_print_rx_config_cmd(struct iwl3945_priv *priv,
} }
#endif #endif
static void iwl3945_enable_interrupts(struct iwl3945_priv *priv) static void iwl3945_enable_interrupts(struct iwl_priv *priv)
{ {
IWL_DEBUG_ISR("Enabling interrupts\n"); IWL_DEBUG_ISR("Enabling interrupts\n");
set_bit(STATUS_INT_ENABLED, &priv->status); set_bit(STATUS_INT_ENABLED, &priv->status);
...@@ -3900,7 +3900,7 @@ static void iwl3945_enable_interrupts(struct iwl3945_priv *priv) ...@@ -3900,7 +3900,7 @@ static void iwl3945_enable_interrupts(struct iwl3945_priv *priv)
/* call this function to flush any scheduled tasklet */ /* call this function to flush any scheduled tasklet */
static inline void iwl_synchronize_irq(struct iwl3945_priv *priv) static inline void iwl_synchronize_irq(struct iwl_priv *priv)
{ {
/* wait to make sure we flush pending tasklet*/ /* wait to make sure we flush pending tasklet*/
synchronize_irq(priv->pci_dev->irq); synchronize_irq(priv->pci_dev->irq);
...@@ -3908,7 +3908,7 @@ static inline void iwl_synchronize_irq(struct iwl3945_priv *priv) ...@@ -3908,7 +3908,7 @@ static inline void iwl_synchronize_irq(struct iwl3945_priv *priv)
} }
static inline void iwl3945_disable_interrupts(struct iwl3945_priv *priv) static inline void iwl3945_disable_interrupts(struct iwl_priv *priv)
{ {
clear_bit(STATUS_INT_ENABLED, &priv->status); clear_bit(STATUS_INT_ENABLED, &priv->status);
...@@ -3945,7 +3945,7 @@ static const char *desc_lookup(int i) ...@@ -3945,7 +3945,7 @@ static const char *desc_lookup(int i)
#define ERROR_START_OFFSET (1 * sizeof(u32)) #define ERROR_START_OFFSET (1 * sizeof(u32))
#define ERROR_ELEM_SIZE (7 * sizeof(u32)) #define ERROR_ELEM_SIZE (7 * sizeof(u32))
static void iwl3945_dump_nic_error_log(struct iwl3945_priv *priv) static void iwl3945_dump_nic_error_log(struct iwl_priv *priv)
{ {
u32 i; u32 i;
u32 desc, time, count, base, data1; u32 desc, time, count, base, data1;
...@@ -4008,7 +4008,7 @@ static void iwl3945_dump_nic_error_log(struct iwl3945_priv *priv) ...@@ -4008,7 +4008,7 @@ static void iwl3945_dump_nic_error_log(struct iwl3945_priv *priv)
* *
* NOTE: Must be called with iwl3945_grab_nic_access() already obtained! * NOTE: Must be called with iwl3945_grab_nic_access() already obtained!
*/ */
static void iwl3945_print_event_log(struct iwl3945_priv *priv, u32 start_idx, static void iwl3945_print_event_log(struct iwl_priv *priv, u32 start_idx,
u32 num_events, u32 mode) u32 num_events, u32 mode)
{ {
u32 i; u32 i;
...@@ -4046,7 +4046,7 @@ static void iwl3945_print_event_log(struct iwl3945_priv *priv, u32 start_idx, ...@@ -4046,7 +4046,7 @@ static void iwl3945_print_event_log(struct iwl3945_priv *priv, u32 start_idx,
} }
} }
static void iwl3945_dump_nic_event_log(struct iwl3945_priv *priv) static void iwl3945_dump_nic_event_log(struct iwl_priv *priv)
{ {
int rc; int rc;
u32 base; /* SRAM byte address of event log header */ u32 base; /* SRAM byte address of event log header */
...@@ -4101,7 +4101,7 @@ static void iwl3945_dump_nic_event_log(struct iwl3945_priv *priv) ...@@ -4101,7 +4101,7 @@ static void iwl3945_dump_nic_event_log(struct iwl3945_priv *priv)
/** /**
* iwl3945_irq_handle_error - called for HW or SW error interrupt from card * iwl3945_irq_handle_error - called for HW or SW error interrupt from card
*/ */
static void iwl3945_irq_handle_error(struct iwl3945_priv *priv) static void iwl3945_irq_handle_error(struct iwl_priv *priv)
{ {
/* Set the FW error flag -- cleared on iwl3945_down */ /* Set the FW error flag -- cleared on iwl3945_down */
set_bit(STATUS_FW_ERROR, &priv->status); set_bit(STATUS_FW_ERROR, &priv->status);
...@@ -4136,7 +4136,7 @@ static void iwl3945_irq_handle_error(struct iwl3945_priv *priv) ...@@ -4136,7 +4136,7 @@ static void iwl3945_irq_handle_error(struct iwl3945_priv *priv)
} }
} }
static void iwl3945_error_recovery(struct iwl3945_priv *priv) static void iwl3945_error_recovery(struct iwl_priv *priv)
{ {
unsigned long flags; unsigned long flags;
...@@ -4153,7 +4153,7 @@ static void iwl3945_error_recovery(struct iwl3945_priv *priv) ...@@ -4153,7 +4153,7 @@ static void iwl3945_error_recovery(struct iwl3945_priv *priv)
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
} }
static void iwl3945_irq_tasklet(struct iwl3945_priv *priv) static void iwl3945_irq_tasklet(struct iwl_priv *priv)
{ {
u32 inta, handled = 0; u32 inta, handled = 0;
u32 inta_fh; u32 inta_fh;
...@@ -4295,7 +4295,7 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv) ...@@ -4295,7 +4295,7 @@ static void iwl3945_irq_tasklet(struct iwl3945_priv *priv)
static irqreturn_t iwl3945_isr(int irq, void *data) static irqreturn_t iwl3945_isr(int irq, void *data)
{ {
struct iwl3945_priv *priv = data; struct iwl_priv *priv = data;
u32 inta, inta_mask; u32 inta, inta_mask;
u32 inta_fh; u32 inta_fh;
if (!priv) if (!priv)
...@@ -4403,7 +4403,7 @@ static const u8 iwl3945_eeprom_band_5[] = { /* 5725-5825MHz */ ...@@ -4403,7 +4403,7 @@ static const u8 iwl3945_eeprom_band_5[] = { /* 5725-5825MHz */
145, 149, 153, 157, 161, 165 145, 149, 153, 157, 161, 165
}; };
static void iwl3945_init_band_reference(const struct iwl3945_priv *priv, int band, static void iwl3945_init_band_reference(const struct iwl_priv *priv, int band,
int *eeprom_ch_count, int *eeprom_ch_count,
const struct iwl_eeprom_channel const struct iwl_eeprom_channel
**eeprom_ch_info, **eeprom_ch_info,
...@@ -4447,7 +4447,7 @@ static void iwl3945_init_band_reference(const struct iwl3945_priv *priv, int ban ...@@ -4447,7 +4447,7 @@ static void iwl3945_init_band_reference(const struct iwl3945_priv *priv, int ban
* Based on band and channel number. * Based on band and channel number.
*/ */
const struct iwl_channel_info * const struct iwl_channel_info *
iwl3945_get_channel_info(const struct iwl3945_priv *priv, iwl3945_get_channel_info(const struct iwl_priv *priv,
enum ieee80211_band band, u16 channel) enum ieee80211_band band, u16 channel)
{ {
int i; int i;
...@@ -4477,7 +4477,7 @@ iwl3945_get_channel_info(const struct iwl3945_priv *priv, ...@@ -4477,7 +4477,7 @@ iwl3945_get_channel_info(const struct iwl3945_priv *priv,
/** /**
* iwl3945_init_channel_map - Set up driver's info for all possible channels * iwl3945_init_channel_map - Set up driver's info for all possible channels
*/ */
static int iwl3945_init_channel_map(struct iwl3945_priv *priv) static int iwl3945_init_channel_map(struct iwl_priv *priv)
{ {
int eeprom_ch_count = 0; int eeprom_ch_count = 0;
const u8 *eeprom_ch_index = NULL; const u8 *eeprom_ch_index = NULL;
...@@ -4596,7 +4596,7 @@ static int iwl3945_init_channel_map(struct iwl3945_priv *priv) ...@@ -4596,7 +4596,7 @@ static int iwl3945_init_channel_map(struct iwl3945_priv *priv)
/* /*
* iwl3945_free_channel_map - undo allocations in iwl3945_init_channel_map * iwl3945_free_channel_map - undo allocations in iwl3945_init_channel_map
*/ */
static void iwl3945_free_channel_map(struct iwl3945_priv *priv) static void iwl3945_free_channel_map(struct iwl_priv *priv)
{ {
kfree(priv->channel_info); kfree(priv->channel_info);
priv->channel_count = 0; priv->channel_count = 0;
...@@ -4630,7 +4630,7 @@ static void iwl3945_free_channel_map(struct iwl3945_priv *priv) ...@@ -4630,7 +4630,7 @@ static void iwl3945_free_channel_map(struct iwl3945_priv *priv)
#define IWL_SCAN_PROBE_MASK(n) (BIT(n) | (BIT(n) - BIT(1))) #define IWL_SCAN_PROBE_MASK(n) (BIT(n) | (BIT(n) - BIT(1)))
static inline u16 iwl3945_get_active_dwell_time(struct iwl3945_priv *priv, static inline u16 iwl3945_get_active_dwell_time(struct iwl_priv *priv,
enum ieee80211_band band, enum ieee80211_band band,
u8 n_probes) u8 n_probes)
{ {
...@@ -4642,7 +4642,7 @@ static inline u16 iwl3945_get_active_dwell_time(struct iwl3945_priv *priv, ...@@ -4642,7 +4642,7 @@ static inline u16 iwl3945_get_active_dwell_time(struct iwl3945_priv *priv,
IWL_ACTIVE_DWELL_FACTOR_24GHZ * (n_probes + 1); IWL_ACTIVE_DWELL_FACTOR_24GHZ * (n_probes + 1);
} }
static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv, static u16 iwl3945_get_passive_dwell_time(struct iwl_priv *priv,
enum ieee80211_band band) enum ieee80211_band band)
{ {
u16 passive = (band == IEEE80211_BAND_2GHZ) ? u16 passive = (band == IEEE80211_BAND_2GHZ) ?
...@@ -4662,7 +4662,7 @@ static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv, ...@@ -4662,7 +4662,7 @@ static u16 iwl3945_get_passive_dwell_time(struct iwl3945_priv *priv,
return passive; return passive;
} }
static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv, static int iwl3945_get_channels_for_scan(struct iwl_priv *priv,
enum ieee80211_band band, enum ieee80211_band band,
u8 is_active, u8 n_probes, u8 is_active, u8 n_probes,
struct iwl3945_scan_channel *scan_ch) struct iwl3945_scan_channel *scan_ch)
...@@ -4756,7 +4756,7 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv, ...@@ -4756,7 +4756,7 @@ static int iwl3945_get_channels_for_scan(struct iwl3945_priv *priv,
return added; return added;
} }
static void iwl3945_init_hw_rates(struct iwl3945_priv *priv, static void iwl3945_init_hw_rates(struct iwl_priv *priv,
struct ieee80211_rate *rates) struct ieee80211_rate *rates)
{ {
int i; int i;
...@@ -4779,7 +4779,7 @@ static void iwl3945_init_hw_rates(struct iwl3945_priv *priv, ...@@ -4779,7 +4779,7 @@ static void iwl3945_init_hw_rates(struct iwl3945_priv *priv,
/** /**
* iwl3945_init_geos - Initialize mac80211's geo/channel info based from eeprom * iwl3945_init_geos - Initialize mac80211's geo/channel info based from eeprom
*/ */
static int iwl3945_init_geos(struct iwl3945_priv *priv) static int iwl3945_init_geos(struct iwl_priv *priv)
{ {
struct iwl_channel_info *ch; struct iwl_channel_info *ch;
struct ieee80211_supported_band *sband; struct ieee80211_supported_band *sband;
...@@ -4901,7 +4901,7 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv) ...@@ -4901,7 +4901,7 @@ static int iwl3945_init_geos(struct iwl3945_priv *priv)
/* /*
* iwl3945_free_geos - undo allocations in iwl3945_init_geos * iwl3945_free_geos - undo allocations in iwl3945_init_geos
*/ */
static void iwl3945_free_geos(struct iwl3945_priv *priv) static void iwl3945_free_geos(struct iwl_priv *priv)
{ {
kfree(priv->ieee_channels); kfree(priv->ieee_channels);
kfree(priv->ieee_rates); kfree(priv->ieee_rates);
...@@ -4914,7 +4914,7 @@ static void iwl3945_free_geos(struct iwl3945_priv *priv) ...@@ -4914,7 +4914,7 @@ static void iwl3945_free_geos(struct iwl3945_priv *priv)
* *
******************************************************************************/ ******************************************************************************/
static void iwl3945_dealloc_ucode_pci(struct iwl3945_priv *priv) static void iwl3945_dealloc_ucode_pci(struct iwl_priv *priv)
{ {
iwl_free_fw_desc(priv->pci_dev, &priv->ucode_code); iwl_free_fw_desc(priv->pci_dev, &priv->ucode_code);
iwl_free_fw_desc(priv->pci_dev, &priv->ucode_data); iwl_free_fw_desc(priv->pci_dev, &priv->ucode_data);
...@@ -4928,7 +4928,7 @@ static void iwl3945_dealloc_ucode_pci(struct iwl3945_priv *priv) ...@@ -4928,7 +4928,7 @@ static void iwl3945_dealloc_ucode_pci(struct iwl3945_priv *priv)
* iwl3945_verify_inst_full - verify runtime uCode image in card vs. host, * iwl3945_verify_inst_full - verify runtime uCode image in card vs. host,
* looking at all data. * looking at all data.
*/ */
static int iwl3945_verify_inst_full(struct iwl3945_priv *priv, __le32 *image, u32 len) static int iwl3945_verify_inst_full(struct iwl_priv *priv, __le32 *image, u32 len)
{ {
u32 val; u32 val;
u32 save_len = len; u32 save_len = len;
...@@ -4975,7 +4975,7 @@ static int iwl3945_verify_inst_full(struct iwl3945_priv *priv, __le32 *image, u3 ...@@ -4975,7 +4975,7 @@ static int iwl3945_verify_inst_full(struct iwl3945_priv *priv, __le32 *image, u3
* using sample data 100 bytes apart. If these sample points are good, * using sample data 100 bytes apart. If these sample points are good,
* it's a pretty good bet that everything between them is good, too. * it's a pretty good bet that everything between them is good, too.
*/ */
static int iwl3945_verify_inst_sparse(struct iwl3945_priv *priv, __le32 *image, u32 len) static int iwl3945_verify_inst_sparse(struct iwl_priv *priv, __le32 *image, u32 len)
{ {
u32 val; u32 val;
int rc = 0; int rc = 0;
...@@ -5018,7 +5018,7 @@ static int iwl3945_verify_inst_sparse(struct iwl3945_priv *priv, __le32 *image, ...@@ -5018,7 +5018,7 @@ static int iwl3945_verify_inst_sparse(struct iwl3945_priv *priv, __le32 *image,
* iwl3945_verify_ucode - determine which instruction image is in SRAM, * iwl3945_verify_ucode - determine which instruction image is in SRAM,
* and verify its contents * and verify its contents
*/ */
static int iwl3945_verify_ucode(struct iwl3945_priv *priv) static int iwl3945_verify_ucode(struct iwl_priv *priv)
{ {
__le32 *image; __le32 *image;
u32 len; u32 len;
...@@ -5065,7 +5065,7 @@ static int iwl3945_verify_ucode(struct iwl3945_priv *priv) ...@@ -5065,7 +5065,7 @@ static int iwl3945_verify_ucode(struct iwl3945_priv *priv)
/* check contents of special bootstrap uCode SRAM */ /* check contents of special bootstrap uCode SRAM */
static int iwl3945_verify_bsm(struct iwl3945_priv *priv) static int iwl3945_verify_bsm(struct iwl_priv *priv)
{ {
__le32 *image = priv->ucode_boot.v_addr; __le32 *image = priv->ucode_boot.v_addr;
u32 len = priv->ucode_boot.len; u32 len = priv->ucode_boot.len;
...@@ -5127,7 +5127,7 @@ static int iwl3945_verify_bsm(struct iwl3945_priv *priv) ...@@ -5127,7 +5127,7 @@ static int iwl3945_verify_bsm(struct iwl3945_priv *priv)
* the runtime uCode instructions and the backup data cache into SRAM, * the runtime uCode instructions and the backup data cache into SRAM,
* and re-launches the runtime uCode from where it left off. * and re-launches the runtime uCode from where it left off.
*/ */
static int iwl3945_load_bsm(struct iwl3945_priv *priv) static int iwl3945_load_bsm(struct iwl_priv *priv)
{ {
__le32 *image = priv->ucode_boot.v_addr; __le32 *image = priv->ucode_boot.v_addr;
u32 len = priv->ucode_boot.len; u32 len = priv->ucode_boot.len;
...@@ -5213,7 +5213,7 @@ static int iwl3945_load_bsm(struct iwl3945_priv *priv) ...@@ -5213,7 +5213,7 @@ static int iwl3945_load_bsm(struct iwl3945_priv *priv)
return 0; return 0;
} }
static void iwl3945_nic_start(struct iwl3945_priv *priv) static void iwl3945_nic_start(struct iwl_priv *priv)
{ {
/* Remove all resets to allow NIC to operate */ /* Remove all resets to allow NIC to operate */
iwl3945_write32(priv, CSR_RESET, 0); iwl3945_write32(priv, CSR_RESET, 0);
...@@ -5224,7 +5224,7 @@ static void iwl3945_nic_start(struct iwl3945_priv *priv) ...@@ -5224,7 +5224,7 @@ static void iwl3945_nic_start(struct iwl3945_priv *priv)
* *
* Copy into buffers for card to fetch via bus-mastering * Copy into buffers for card to fetch via bus-mastering
*/ */
static int iwl3945_read_ucode(struct iwl3945_priv *priv) static int iwl3945_read_ucode(struct iwl_priv *priv)
{ {
struct iwl_ucode *ucode; struct iwl_ucode *ucode;
int ret = -EINVAL, index; int ret = -EINVAL, index;
...@@ -5465,7 +5465,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv) ...@@ -5465,7 +5465,7 @@ static int iwl3945_read_ucode(struct iwl3945_priv *priv)
* We need to replace them to load runtime uCode inst and data, * We need to replace them to load runtime uCode inst and data,
* and to save runtime data when powering down. * and to save runtime data when powering down.
*/ */
static int iwl3945_set_ucode_ptrs(struct iwl3945_priv *priv) static int iwl3945_set_ucode_ptrs(struct iwl_priv *priv)
{ {
dma_addr_t pinst; dma_addr_t pinst;
dma_addr_t pdata; dma_addr_t pdata;
...@@ -5510,7 +5510,7 @@ static int iwl3945_set_ucode_ptrs(struct iwl3945_priv *priv) ...@@ -5510,7 +5510,7 @@ static int iwl3945_set_ucode_ptrs(struct iwl3945_priv *priv)
* *
* Tell "initialize" uCode to go ahead and load the runtime uCode. * Tell "initialize" uCode to go ahead and load the runtime uCode.
*/ */
static void iwl3945_init_alive_start(struct iwl3945_priv *priv) static void iwl3945_init_alive_start(struct iwl_priv *priv)
{ {
/* Check alive response for "valid" sign from uCode */ /* Check alive response for "valid" sign from uCode */
if (priv->card_alive_init.is_valid != UCODE_VALID_OK) { if (priv->card_alive_init.is_valid != UCODE_VALID_OK) {
...@@ -5556,7 +5556,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, ...@@ -5556,7 +5556,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw,
* from protocol/runtime uCode (initialization uCode's * from protocol/runtime uCode (initialization uCode's
* Alive gets handled by iwl3945_init_alive_start()). * Alive gets handled by iwl3945_init_alive_start()).
*/ */
static void iwl3945_alive_start(struct iwl3945_priv *priv) static void iwl3945_alive_start(struct iwl_priv *priv)
{ {
int rc = 0; int rc = 0;
int thermal_spin = 0; int thermal_spin = 0;
...@@ -5668,9 +5668,9 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv) ...@@ -5668,9 +5668,9 @@ static void iwl3945_alive_start(struct iwl3945_priv *priv)
queue_work(priv->workqueue, &priv->restart); queue_work(priv->workqueue, &priv->restart);
} }
static void iwl3945_cancel_deferred_work(struct iwl3945_priv *priv); static void iwl3945_cancel_deferred_work(struct iwl_priv *priv);
static void __iwl3945_down(struct iwl3945_priv *priv) static void __iwl3945_down(struct iwl_priv *priv)
{ {
unsigned long flags; unsigned long flags;
int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status); int exit_pending = test_bit(STATUS_EXIT_PENDING, &priv->status);
...@@ -5769,7 +5769,7 @@ static void __iwl3945_down(struct iwl3945_priv *priv) ...@@ -5769,7 +5769,7 @@ static void __iwl3945_down(struct iwl3945_priv *priv)
iwl3945_clear_free_frames(priv); iwl3945_clear_free_frames(priv);
} }
static void iwl3945_down(struct iwl3945_priv *priv) static void iwl3945_down(struct iwl_priv *priv)
{ {
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
__iwl3945_down(priv); __iwl3945_down(priv);
...@@ -5780,7 +5780,7 @@ static void iwl3945_down(struct iwl3945_priv *priv) ...@@ -5780,7 +5780,7 @@ static void iwl3945_down(struct iwl3945_priv *priv)
#define MAX_HW_RESTARTS 5 #define MAX_HW_RESTARTS 5
static int __iwl3945_up(struct iwl3945_priv *priv) static int __iwl3945_up(struct iwl_priv *priv)
{ {
int rc, i; int rc, i;
...@@ -5884,8 +5884,8 @@ static int __iwl3945_up(struct iwl3945_priv *priv) ...@@ -5884,8 +5884,8 @@ static int __iwl3945_up(struct iwl3945_priv *priv)
static void iwl3945_bg_init_alive_start(struct work_struct *data) static void iwl3945_bg_init_alive_start(struct work_struct *data)
{ {
struct iwl3945_priv *priv = struct iwl_priv *priv =
container_of(data, struct iwl3945_priv, init_alive_start.work); container_of(data, struct iwl_priv, init_alive_start.work);
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;
...@@ -5897,8 +5897,8 @@ static void iwl3945_bg_init_alive_start(struct work_struct *data) ...@@ -5897,8 +5897,8 @@ static void iwl3945_bg_init_alive_start(struct work_struct *data)
static void iwl3945_bg_alive_start(struct work_struct *data) static void iwl3945_bg_alive_start(struct work_struct *data)
{ {
struct iwl3945_priv *priv = struct iwl_priv *priv =
container_of(data, struct iwl3945_priv, alive_start.work); container_of(data, struct iwl_priv, alive_start.work);
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;
...@@ -5910,7 +5910,7 @@ static void iwl3945_bg_alive_start(struct work_struct *data) ...@@ -5910,7 +5910,7 @@ static void iwl3945_bg_alive_start(struct work_struct *data)
static void iwl3945_bg_rf_kill(struct work_struct *work) static void iwl3945_bg_rf_kill(struct work_struct *work)
{ {
struct iwl3945_priv *priv = container_of(work, struct iwl3945_priv, rf_kill); struct iwl_priv *priv = container_of(work, struct iwl_priv, rf_kill);
wake_up_interruptible(&priv->wait_command_queue); wake_up_interruptible(&priv->wait_command_queue);
...@@ -5944,8 +5944,8 @@ static void iwl3945_bg_rf_kill(struct work_struct *work) ...@@ -5944,8 +5944,8 @@ static void iwl3945_bg_rf_kill(struct work_struct *work)
static void iwl3945_bg_scan_check(struct work_struct *data) static void iwl3945_bg_scan_check(struct work_struct *data)
{ {
struct iwl3945_priv *priv = struct iwl_priv *priv =
container_of(data, struct iwl3945_priv, scan_check.work); container_of(data, struct iwl_priv, scan_check.work);
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;
...@@ -5965,8 +5965,8 @@ static void iwl3945_bg_scan_check(struct work_struct *data) ...@@ -5965,8 +5965,8 @@ static void iwl3945_bg_scan_check(struct work_struct *data)
static void iwl3945_bg_request_scan(struct work_struct *data) static void iwl3945_bg_request_scan(struct work_struct *data)
{ {
struct iwl3945_priv *priv = struct iwl_priv *priv =
container_of(data, struct iwl3945_priv, request_scan); container_of(data, struct iwl_priv, request_scan);
struct iwl3945_host_cmd cmd = { struct iwl3945_host_cmd cmd = {
.id = REPLY_SCAN_CMD, .id = REPLY_SCAN_CMD,
.len = sizeof(struct iwl3945_scan_cmd), .len = sizeof(struct iwl3945_scan_cmd),
...@@ -6161,7 +6161,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data) ...@@ -6161,7 +6161,7 @@ static void iwl3945_bg_request_scan(struct work_struct *data)
static void iwl3945_bg_up(struct work_struct *data) static void iwl3945_bg_up(struct work_struct *data)
{ {
struct iwl3945_priv *priv = container_of(data, struct iwl3945_priv, up); struct iwl_priv *priv = container_of(data, struct iwl_priv, up);
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;
...@@ -6174,7 +6174,7 @@ static void iwl3945_bg_up(struct work_struct *data) ...@@ -6174,7 +6174,7 @@ static void iwl3945_bg_up(struct work_struct *data)
static void iwl3945_bg_restart(struct work_struct *data) static void iwl3945_bg_restart(struct work_struct *data)
{ {
struct iwl3945_priv *priv = container_of(data, struct iwl3945_priv, restart); struct iwl_priv *priv = container_of(data, struct iwl_priv, restart);
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;
...@@ -6185,8 +6185,8 @@ static void iwl3945_bg_restart(struct work_struct *data) ...@@ -6185,8 +6185,8 @@ static void iwl3945_bg_restart(struct work_struct *data)
static void iwl3945_bg_rx_replenish(struct work_struct *data) static void iwl3945_bg_rx_replenish(struct work_struct *data)
{ {
struct iwl3945_priv *priv = struct iwl_priv *priv =
container_of(data, struct iwl3945_priv, rx_replenish); container_of(data, struct iwl_priv, rx_replenish);
if (test_bit(STATUS_EXIT_PENDING, &priv->status)) if (test_bit(STATUS_EXIT_PENDING, &priv->status))
return; return;
...@@ -6198,7 +6198,7 @@ static void iwl3945_bg_rx_replenish(struct work_struct *data) ...@@ -6198,7 +6198,7 @@ static void iwl3945_bg_rx_replenish(struct work_struct *data)
#define IWL_DELAY_NEXT_SCAN (HZ*2) #define IWL_DELAY_NEXT_SCAN (HZ*2)
static void iwl3945_post_associate(struct iwl3945_priv *priv) static void iwl3945_post_associate(struct iwl_priv *priv)
{ {
int rc = 0; int rc = 0;
struct ieee80211_conf *conf = NULL; struct ieee80211_conf *conf = NULL;
...@@ -6290,7 +6290,7 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv) ...@@ -6290,7 +6290,7 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
static void iwl3945_bg_abort_scan(struct work_struct *work) static void iwl3945_bg_abort_scan(struct work_struct *work)
{ {
struct iwl3945_priv *priv = container_of(work, struct iwl3945_priv, abort_scan); struct iwl_priv *priv = container_of(work, struct iwl_priv, abort_scan);
if (!iwl3945_is_ready(priv)) if (!iwl3945_is_ready(priv))
return; return;
...@@ -6307,8 +6307,8 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed); ...@@ -6307,8 +6307,8 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed);
static void iwl3945_bg_scan_completed(struct work_struct *work) static void iwl3945_bg_scan_completed(struct work_struct *work)
{ {
struct iwl3945_priv *priv = struct iwl_priv *priv =
container_of(work, struct iwl3945_priv, scan_completed); container_of(work, struct iwl_priv, scan_completed);
IWL_DEBUG(IWL_DL_INFO | IWL_DL_SCAN, "SCAN complete scan\n"); IWL_DEBUG(IWL_DL_INFO | IWL_DL_SCAN, "SCAN complete scan\n");
...@@ -6337,7 +6337,7 @@ static void iwl3945_bg_scan_completed(struct work_struct *work) ...@@ -6337,7 +6337,7 @@ static void iwl3945_bg_scan_completed(struct work_struct *work)
static int iwl3945_mac_start(struct ieee80211_hw *hw) static int iwl3945_mac_start(struct ieee80211_hw *hw)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
int ret; int ret;
IWL_DEBUG_MAC80211("enter\n"); IWL_DEBUG_MAC80211("enter\n");
...@@ -6416,7 +6416,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw) ...@@ -6416,7 +6416,7 @@ static int iwl3945_mac_start(struct ieee80211_hw *hw)
static void iwl3945_mac_stop(struct ieee80211_hw *hw) static void iwl3945_mac_stop(struct ieee80211_hw *hw)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
IWL_DEBUG_MAC80211("enter\n"); IWL_DEBUG_MAC80211("enter\n");
...@@ -6449,7 +6449,7 @@ static void iwl3945_mac_stop(struct ieee80211_hw *hw) ...@@ -6449,7 +6449,7 @@ static void iwl3945_mac_stop(struct ieee80211_hw *hw)
static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
IWL_DEBUG_MAC80211("enter\n"); IWL_DEBUG_MAC80211("enter\n");
...@@ -6466,7 +6466,7 @@ static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb) ...@@ -6466,7 +6466,7 @@ static int iwl3945_mac_tx(struct ieee80211_hw *hw, struct sk_buff *skb)
static int iwl3945_mac_add_interface(struct ieee80211_hw *hw, static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
struct ieee80211_if_init_conf *conf) struct ieee80211_if_init_conf *conf)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
unsigned long flags; unsigned long flags;
IWL_DEBUG_MAC80211("enter: type %d\n", conf->type); IWL_DEBUG_MAC80211("enter: type %d\n", conf->type);
...@@ -6507,7 +6507,7 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw, ...@@ -6507,7 +6507,7 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
*/ */
static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed) static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
const struct iwl_channel_info *ch_info; const struct iwl_channel_info *ch_info;
struct ieee80211_conf *conf = &hw->conf; struct ieee80211_conf *conf = &hw->conf;
unsigned long flags; unsigned long flags;
...@@ -6590,7 +6590,7 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed) ...@@ -6590,7 +6590,7 @@ static int iwl3945_mac_config(struct ieee80211_hw *hw, u32 changed)
return ret; return ret;
} }
static void iwl3945_config_ap(struct iwl3945_priv *priv) static void iwl3945_config_ap(struct iwl_priv *priv)
{ {
int rc = 0; int rc = 0;
...@@ -6651,7 +6651,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw, ...@@ -6651,7 +6651,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
struct ieee80211_if_conf *conf) struct ieee80211_if_conf *conf)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
int rc; int rc;
if (conf == NULL) if (conf == NULL)
...@@ -6752,7 +6752,7 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw, ...@@ -6752,7 +6752,7 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw,
unsigned int *total_flags, unsigned int *total_flags,
int mc_count, struct dev_addr_list *mc_list) int mc_count, struct dev_addr_list *mc_list)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
__le32 *filter_flags = &priv->staging39_rxon.filter_flags; __le32 *filter_flags = &priv->staging39_rxon.filter_flags;
IWL_DEBUG_MAC80211("Enter: changed: 0x%x, total: 0x%x\n", IWL_DEBUG_MAC80211("Enter: changed: 0x%x, total: 0x%x\n",
...@@ -6796,7 +6796,7 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw, ...@@ -6796,7 +6796,7 @@ static void iwl3945_configure_filter(struct ieee80211_hw *hw,
static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw, static void iwl3945_mac_remove_interface(struct ieee80211_hw *hw,
struct ieee80211_if_init_conf *conf) struct ieee80211_if_init_conf *conf)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
IWL_DEBUG_MAC80211("enter\n"); IWL_DEBUG_MAC80211("enter\n");
...@@ -6823,7 +6823,7 @@ static void iwl3945_bss_info_changed(struct ieee80211_hw *hw, ...@@ -6823,7 +6823,7 @@ static void iwl3945_bss_info_changed(struct ieee80211_hw *hw,
struct ieee80211_bss_conf *bss_conf, struct ieee80211_bss_conf *bss_conf,
u32 changes) u32 changes)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
IWL_DEBUG_MAC80211("changes = 0x%X\n", changes); IWL_DEBUG_MAC80211("changes = 0x%X\n", changes);
...@@ -6875,7 +6875,7 @@ static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len) ...@@ -6875,7 +6875,7 @@ static int iwl3945_mac_hw_scan(struct ieee80211_hw *hw, u8 *ssid, size_t len)
{ {
int rc = 0; int rc = 0;
unsigned long flags; unsigned long flags;
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
DECLARE_SSID_BUF(ssid_buf); DECLARE_SSID_BUF(ssid_buf);
IWL_DEBUG_MAC80211("enter\n"); IWL_DEBUG_MAC80211("enter\n");
...@@ -6928,7 +6928,7 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, ...@@ -6928,7 +6928,7 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
const u8 *local_addr, const u8 *addr, const u8 *local_addr, const u8 *addr,
struct ieee80211_key_conf *key) struct ieee80211_key_conf *key)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
int rc = 0; int rc = 0;
u8 sta_id; u8 sta_id;
...@@ -6986,7 +6986,7 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, ...@@ -6986,7 +6986,7 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
const struct ieee80211_tx_queue_params *params) const struct ieee80211_tx_queue_params *params)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
unsigned long flags; unsigned long flags;
int q; int q;
...@@ -7032,7 +7032,7 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue, ...@@ -7032,7 +7032,7 @@ static int iwl3945_mac_conf_tx(struct ieee80211_hw *hw, u16 queue,
static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw, static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw,
struct ieee80211_tx_queue_stats *stats) struct ieee80211_tx_queue_stats *stats)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
int i, avail; int i, avail;
struct iwl3945_tx_queue *txq; struct iwl3945_tx_queue *txq;
struct iwl_queue *q; struct iwl_queue *q;
...@@ -7066,7 +7066,7 @@ static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw, ...@@ -7066,7 +7066,7 @@ static int iwl3945_mac_get_tx_stats(struct ieee80211_hw *hw,
static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw) static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
unsigned long flags; unsigned long flags;
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
...@@ -7125,7 +7125,7 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw) ...@@ -7125,7 +7125,7 @@ static void iwl3945_mac_reset_tsf(struct ieee80211_hw *hw)
static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb) static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb)
{ {
struct iwl3945_priv *priv = hw->priv; struct iwl_priv *priv = hw->priv;
unsigned long flags; unsigned long flags;
IWL_DEBUG_MAC80211("enter\n"); IWL_DEBUG_MAC80211("enter\n");
...@@ -7178,7 +7178,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk ...@@ -7178,7 +7178,7 @@ static int iwl3945_mac_beacon_update(struct ieee80211_hw *hw, struct sk_buff *sk
static ssize_t show_debug_level(struct device *d, static ssize_t show_debug_level(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = d->driver_data; struct iwl_priv *priv = d->driver_data;
return sprintf(buf, "0x%08X\n", priv->debug_level); return sprintf(buf, "0x%08X\n", priv->debug_level);
} }
...@@ -7186,7 +7186,7 @@ static ssize_t store_debug_level(struct device *d, ...@@ -7186,7 +7186,7 @@ static ssize_t store_debug_level(struct device *d,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct iwl3945_priv *priv = d->driver_data; struct iwl_priv *priv = d->driver_data;
unsigned long val; unsigned long val;
int ret; int ret;
...@@ -7208,7 +7208,7 @@ static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO, ...@@ -7208,7 +7208,7 @@ static DEVICE_ATTR(debug_level, S_IWUSR | S_IRUGO,
static ssize_t show_temperature(struct device *d, static ssize_t show_temperature(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
if (!iwl3945_is_alive(priv)) if (!iwl3945_is_alive(priv))
return -EAGAIN; return -EAGAIN;
...@@ -7221,7 +7221,7 @@ static DEVICE_ATTR(temperature, S_IRUGO, show_temperature, NULL); ...@@ -7221,7 +7221,7 @@ static DEVICE_ATTR(temperature, S_IRUGO, show_temperature, NULL);
static ssize_t show_tx_power(struct device *d, static ssize_t show_tx_power(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
return sprintf(buf, "%d\n", priv->user_txpower_limit); return sprintf(buf, "%d\n", priv->user_txpower_limit);
} }
...@@ -7229,7 +7229,7 @@ static ssize_t store_tx_power(struct device *d, ...@@ -7229,7 +7229,7 @@ static ssize_t store_tx_power(struct device *d,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
char *p = (char *)buf; char *p = (char *)buf;
u32 val; u32 val;
...@@ -7248,7 +7248,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, show_tx_power, store_tx_power); ...@@ -7248,7 +7248,7 @@ static DEVICE_ATTR(tx_power, S_IWUSR | S_IRUGO, show_tx_power, store_tx_power);
static ssize_t show_flags(struct device *d, static ssize_t show_flags(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
return sprintf(buf, "0x%04X\n", priv->active39_rxon.flags); return sprintf(buf, "0x%04X\n", priv->active39_rxon.flags);
} }
...@@ -7257,7 +7257,7 @@ static ssize_t store_flags(struct device *d, ...@@ -7257,7 +7257,7 @@ static ssize_t store_flags(struct device *d,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
u32 flags = simple_strtoul(buf, NULL, 0); u32 flags = simple_strtoul(buf, NULL, 0);
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
...@@ -7282,7 +7282,7 @@ static DEVICE_ATTR(flags, S_IWUSR | S_IRUGO, show_flags, store_flags); ...@@ -7282,7 +7282,7 @@ static DEVICE_ATTR(flags, S_IWUSR | S_IRUGO, show_flags, store_flags);
static ssize_t show_filter_flags(struct device *d, static ssize_t show_filter_flags(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
return sprintf(buf, "0x%04X\n", return sprintf(buf, "0x%04X\n",
le32_to_cpu(priv->active39_rxon.filter_flags)); le32_to_cpu(priv->active39_rxon.filter_flags));
...@@ -7292,7 +7292,7 @@ static ssize_t store_filter_flags(struct device *d, ...@@ -7292,7 +7292,7 @@ static ssize_t store_filter_flags(struct device *d,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
u32 filter_flags = simple_strtoul(buf, NULL, 0); u32 filter_flags = simple_strtoul(buf, NULL, 0);
mutex_lock(&priv->mutex); mutex_lock(&priv->mutex);
...@@ -7321,7 +7321,7 @@ static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags, ...@@ -7321,7 +7321,7 @@ static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags,
static ssize_t show_measurement(struct device *d, static ssize_t show_measurement(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
struct iwl_spectrum_notification measure_report; struct iwl_spectrum_notification measure_report;
u32 size = sizeof(measure_report), len = 0, ofs = 0; u32 size = sizeof(measure_report), len = 0, ofs = 0;
u8 *data = (u8 *)&measure_report; u8 *data = (u8 *)&measure_report;
...@@ -7354,7 +7354,7 @@ static ssize_t store_measurement(struct device *d, ...@@ -7354,7 +7354,7 @@ static ssize_t store_measurement(struct device *d,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
struct ieee80211_measurement_params params = { struct ieee80211_measurement_params params = {
.channel = le16_to_cpu(priv->active39_rxon.channel), .channel = le16_to_cpu(priv->active39_rxon.channel),
.start_time = cpu_to_le64(priv->last_tsf), .start_time = cpu_to_le64(priv->last_tsf),
...@@ -7393,7 +7393,7 @@ static ssize_t store_retry_rate(struct device *d, ...@@ -7393,7 +7393,7 @@ static ssize_t store_retry_rate(struct device *d,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
priv->retry_rate = simple_strtoul(buf, NULL, 0); priv->retry_rate = simple_strtoul(buf, NULL, 0);
if (priv->retry_rate <= 0) if (priv->retry_rate <= 0)
...@@ -7405,7 +7405,7 @@ static ssize_t store_retry_rate(struct device *d, ...@@ -7405,7 +7405,7 @@ static ssize_t store_retry_rate(struct device *d,
static ssize_t show_retry_rate(struct device *d, static ssize_t show_retry_rate(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
return sprintf(buf, "%d", priv->retry_rate); return sprintf(buf, "%d", priv->retry_rate);
} }
...@@ -7416,7 +7416,7 @@ static ssize_t store_power_level(struct device *d, ...@@ -7416,7 +7416,7 @@ static ssize_t store_power_level(struct device *d,
struct device_attribute *attr, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
int rc; int rc;
int mode; int mode;
...@@ -7471,7 +7471,7 @@ static const s32 period_duration[] = { ...@@ -7471,7 +7471,7 @@ static const s32 period_duration[] = {
static ssize_t show_power_level(struct device *d, static ssize_t show_power_level(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
int level = IWL_POWER_LEVEL(priv->power_mode); int level = IWL_POWER_LEVEL(priv->power_mode);
char *p = buf; char *p = buf;
...@@ -7515,7 +7515,7 @@ static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL); ...@@ -7515,7 +7515,7 @@ static DEVICE_ATTR(channels, S_IRUSR, show_channels, NULL);
static ssize_t show_statistics(struct device *d, static ssize_t show_statistics(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
u32 size = sizeof(struct iwl3945_notif_statistics); u32 size = sizeof(struct iwl3945_notif_statistics);
u32 len = 0, ofs = 0; u32 len = 0, ofs = 0;
u8 *data = (u8 *)&priv->statistics_39; u8 *data = (u8 *)&priv->statistics_39;
...@@ -7553,7 +7553,7 @@ static DEVICE_ATTR(statistics, S_IRUGO, show_statistics, NULL); ...@@ -7553,7 +7553,7 @@ static DEVICE_ATTR(statistics, S_IRUGO, show_statistics, NULL);
static ssize_t show_antenna(struct device *d, static ssize_t show_antenna(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
if (!iwl3945_is_alive(priv)) if (!iwl3945_is_alive(priv))
return -EAGAIN; return -EAGAIN;
...@@ -7566,7 +7566,7 @@ static ssize_t store_antenna(struct device *d, ...@@ -7566,7 +7566,7 @@ static ssize_t store_antenna(struct device *d,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int ant; int ant;
struct iwl3945_priv *priv = dev_get_drvdata(d); struct iwl_priv *priv = dev_get_drvdata(d);
if (count == 0) if (count == 0)
return 0; return 0;
...@@ -7591,7 +7591,7 @@ static DEVICE_ATTR(antenna, S_IWUSR | S_IRUGO, show_antenna, store_antenna); ...@@ -7591,7 +7591,7 @@ static DEVICE_ATTR(antenna, S_IWUSR | S_IRUGO, show_antenna, store_antenna);
static ssize_t show_status(struct device *d, static ssize_t show_status(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct iwl3945_priv *priv = (struct iwl3945_priv *)d->driver_data; struct iwl_priv *priv = (struct iwl_priv *)d->driver_data;
if (!iwl3945_is_alive(priv)) if (!iwl3945_is_alive(priv))
return -EAGAIN; return -EAGAIN;
return sprintf(buf, "0x%08x\n", (int)priv->status); return sprintf(buf, "0x%08x\n", (int)priv->status);
...@@ -7606,7 +7606,7 @@ static ssize_t dump_error_log(struct device *d, ...@@ -7606,7 +7606,7 @@ static ssize_t dump_error_log(struct device *d,
char *p = (char *)buf; char *p = (char *)buf;
if (p[0] == '1') if (p[0] == '1')
iwl3945_dump_nic_error_log((struct iwl3945_priv *)d->driver_data); iwl3945_dump_nic_error_log((struct iwl_priv *)d->driver_data);
return strnlen(buf, count); return strnlen(buf, count);
} }
...@@ -7620,7 +7620,7 @@ static ssize_t dump_event_log(struct device *d, ...@@ -7620,7 +7620,7 @@ static ssize_t dump_event_log(struct device *d,
char *p = (char *)buf; char *p = (char *)buf;
if (p[0] == '1') if (p[0] == '1')
iwl3945_dump_nic_event_log((struct iwl3945_priv *)d->driver_data); iwl3945_dump_nic_event_log((struct iwl_priv *)d->driver_data);
return strnlen(buf, count); return strnlen(buf, count);
} }
...@@ -7633,7 +7633,7 @@ static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log); ...@@ -7633,7 +7633,7 @@ static DEVICE_ATTR(dump_events, S_IWUSR, NULL, dump_event_log);
* *
*****************************************************************************/ *****************************************************************************/
static void iwl3945_setup_deferred_work(struct iwl3945_priv *priv) static void iwl3945_setup_deferred_work(struct iwl_priv *priv)
{ {
priv->workqueue = create_workqueue(DRV_NAME); priv->workqueue = create_workqueue(DRV_NAME);
...@@ -7657,7 +7657,7 @@ static void iwl3945_setup_deferred_work(struct iwl3945_priv *priv) ...@@ -7657,7 +7657,7 @@ static void iwl3945_setup_deferred_work(struct iwl3945_priv *priv)
iwl3945_irq_tasklet, (unsigned long)priv); iwl3945_irq_tasklet, (unsigned long)priv);
} }
static void iwl3945_cancel_deferred_work(struct iwl3945_priv *priv) static void iwl3945_cancel_deferred_work(struct iwl_priv *priv)
{ {
iwl3945_hw_cancel_deferred_work(priv); iwl3945_hw_cancel_deferred_work(priv);
...@@ -7714,7 +7714,7 @@ static struct ieee80211_ops iwl3945_hw_ops = { ...@@ -7714,7 +7714,7 @@ static struct ieee80211_ops iwl3945_hw_ops = {
static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
{ {
int err = 0; int err = 0;
struct iwl3945_priv *priv; struct iwl_priv *priv;
struct ieee80211_hw *hw; struct ieee80211_hw *hw;
struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data); struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
unsigned long flags; unsigned long flags;
...@@ -7725,7 +7725,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7725,7 +7725,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
/* mac80211 allocates memory for this device instance, including /* mac80211 allocates memory for this device instance, including
* space for this driver's private structure */ * space for this driver's private structure */
hw = ieee80211_alloc_hw(sizeof(struct iwl3945_priv), &iwl3945_hw_ops); hw = ieee80211_alloc_hw(sizeof(struct iwl_priv), &iwl3945_hw_ops);
if (hw == NULL) { if (hw == NULL) {
printk(KERN_ERR DRV_NAME "Can not allocate network device\n"); printk(KERN_ERR DRV_NAME "Can not allocate network device\n");
err = -ENOMEM; err = -ENOMEM;
...@@ -7988,7 +7988,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e ...@@ -7988,7 +7988,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
{ {
struct iwl3945_priv *priv = pci_get_drvdata(pdev); struct iwl_priv *priv = pci_get_drvdata(pdev);
unsigned long flags; unsigned long flags;
if (!priv) if (!priv)
...@@ -8051,7 +8051,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev) ...@@ -8051,7 +8051,7 @@ static void __devexit iwl3945_pci_remove(struct pci_dev *pdev)
static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state) static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
{ {
struct iwl3945_priv *priv = pci_get_drvdata(pdev); struct iwl_priv *priv = pci_get_drvdata(pdev);
if (priv->is_open) { if (priv->is_open) {
set_bit(STATUS_IN_SUSPEND, &priv->status); set_bit(STATUS_IN_SUSPEND, &priv->status);
...@@ -8066,7 +8066,7 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state) ...@@ -8066,7 +8066,7 @@ static int iwl3945_pci_suspend(struct pci_dev *pdev, pm_message_t state)
static int iwl3945_pci_resume(struct pci_dev *pdev) static int iwl3945_pci_resume(struct pci_dev *pdev)
{ {
struct iwl3945_priv *priv = pci_get_drvdata(pdev); struct iwl_priv *priv = pci_get_drvdata(pdev);
pci_set_power_state(pdev, PCI_D0); pci_set_power_state(pdev, PCI_D0);
...@@ -8084,7 +8084,7 @@ static int iwl3945_pci_resume(struct pci_dev *pdev) ...@@ -8084,7 +8084,7 @@ static int iwl3945_pci_resume(struct pci_dev *pdev)
/* software rf-kill from user */ /* software rf-kill from user */
static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state) static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
{ {
struct iwl3945_priv *priv = data; struct iwl_priv *priv = data;
int err = 0; int err = 0;
if (!priv->rfkill) if (!priv->rfkill)
...@@ -8117,7 +8117,7 @@ static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state) ...@@ -8117,7 +8117,7 @@ static int iwl3945_rfkill_soft_rf_kill(void *data, enum rfkill_state state)
return err; return err;
} }
int iwl3945_rfkill_init(struct iwl3945_priv *priv) int iwl3945_rfkill_init(struct iwl_priv *priv)
{ {
struct device *device = wiphy_dev(priv->hw->wiphy); struct device *device = wiphy_dev(priv->hw->wiphy);
int ret = 0; int ret = 0;
...@@ -8160,7 +8160,7 @@ int iwl3945_rfkill_init(struct iwl3945_priv *priv) ...@@ -8160,7 +8160,7 @@ int iwl3945_rfkill_init(struct iwl3945_priv *priv)
return ret; return ret;
} }
void iwl3945_rfkill_unregister(struct iwl3945_priv *priv) void iwl3945_rfkill_unregister(struct iwl_priv *priv)
{ {
if (priv->rfkill) if (priv->rfkill)
rfkill_unregister(priv->rfkill); rfkill_unregister(priv->rfkill);
...@@ -8169,7 +8169,7 @@ void iwl3945_rfkill_unregister(struct iwl3945_priv *priv) ...@@ -8169,7 +8169,7 @@ void iwl3945_rfkill_unregister(struct iwl3945_priv *priv)
} }
/* set rf-kill to the right state. */ /* set rf-kill to the right state. */
void iwl3945_rfkill_set_hw_state(struct iwl3945_priv *priv) void iwl3945_rfkill_set_hw_state(struct iwl_priv *priv)
{ {
if (!priv->rfkill) if (!priv->rfkill)
......
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