xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwlwifi: rename iwl-4965-debug.h back to iwl-debug.h

Browse Source 
This patch removes iwl-4965-debug.h to iwl-debug.h
It will be used by more NICs

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Tomas Winkler
2008-03-12 16:58:49 -07:00
committed by John W. Linville
parent 8236e183fc
commit 0a6857e70d
9 changed files with 71 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/wireless/iwlwifi/Kconfig
View File

@@ -50,7 +50,7 @@ config IWL4965_SENSITIVITY
This option will enable sensitivity calibration for the iwl4965 This option will enable sensitivity calibration for the iwl4965
driver. driver.
config IWL4965_DEBUG config IWLWIFI_DEBUG
bool "Enable full debugging output in iwl4965 driver" bool "Enable full debugging output in iwl4965 driver"
depends on IWL4965 depends on IWL4965
---help--- ---help---

36
drivers/net/wireless/iwlwifi/iwl-4965-io.h
View File

@@ -31,7 +31,7 @@
#include <linux/io.h> #include <linux/io.h>
#include "iwl-4965-debug.h" #include "iwl-debug.h"
/* /*
* IO, register, and NIC memory access functions * IO, register, and NIC memory access functions
@@ -60,7 +60,7 @@
*/ */
#define _iwl4965_write32(priv, ofs, val) writel((val), (priv)->hw_base + (ofs)) #define _iwl4965_write32(priv, ofs, val) writel((val), (priv)->hw_base + (ofs))
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv *priv, static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv *priv,
u32 ofs, u32 val) u32 ofs, u32 val)
{ {
@@ -74,7 +74,7 @@ static inline void __iwl4965_write32(const char *f, u32 l, struct iwl4965_priv *
#endif #endif
#define _iwl4965_read32(priv, ofs) readl((priv)->hw_base + (ofs)) #define _iwl4965_read32(priv, ofs) readl((priv)->hw_base + (ofs))
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl4965_priv *priv, u32 ofs) static inline u32 __iwl4965_read32(char *f, u32 l, struct iwl4965_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);
@@ -99,7 +99,7 @@ static inline int _iwl4965_poll_bit(struct iwl4965_priv *priv, u32 addr,
return -ETIMEDOUT; return -ETIMEDOUT;
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline int __iwl4965_poll_bit(const char *f, u32 l, static inline int __iwl4965_poll_bit(const char *f, u32 l,
struct iwl4965_priv *priv, u32 addr, struct iwl4965_priv *priv, u32 addr,
u32 bits, u32 mask, int timeout) u32 bits, u32 mask, int timeout)
@@ -120,7 +120,7 @@ static inline void _iwl4965_set_bit(struct iwl4965_priv *priv, u32 reg, u32 mask
{ {
_iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) | mask); _iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) | mask);
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline void __iwl4965_set_bit(const char *f, u32 l, static inline void __iwl4965_set_bit(const char *f, u32 l,
struct iwl4965_priv *priv, u32 reg, u32 mask) struct iwl4965_priv *priv, u32 reg, u32 mask)
{ {
@@ -137,7 +137,7 @@ static inline void _iwl4965_clear_bit(struct iwl4965_priv *priv, u32 reg, u32 ma
{ {
_iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) & ~mask); _iwl4965_write32(priv, reg, _iwl4965_read32(priv, reg) & ~mask);
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline void __iwl4965_clear_bit(const char *f, u32 l, static inline void __iwl4965_clear_bit(const char *f, u32 l,
struct iwl4965_priv *priv, u32 reg, u32 mask) struct iwl4965_priv *priv, u32 reg, u32 mask)
{ {
@@ -155,7 +155,7 @@ static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv)
int ret; int ret;
u32 gp_ctl; u32 gp_ctl;
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
if (atomic_read(&priv->restrict_refcnt)) if (atomic_read(&priv->restrict_refcnt))
return 0; return 0;
#endif #endif
@@ -186,13 +186,13 @@ static inline int _iwl4965_grab_nic_access(struct iwl4965_priv *priv)
return -EIO; return -EIO;
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
atomic_inc(&priv->restrict_refcnt); atomic_inc(&priv->restrict_refcnt);
#endif #endif
return 0; return 0;
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline int __iwl4965_grab_nic_access(const char *f, u32 l, static inline int __iwl4965_grab_nic_access(const char *f, u32 l,
struct iwl4965_priv *priv) struct iwl4965_priv *priv)
{ {
@@ -212,13 +212,13 @@ static inline int __iwl4965_grab_nic_access(const char *f, u32 l,
static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv) static inline void _iwl4965_release_nic_access(struct iwl4965_priv *priv)
{ {
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
if (atomic_dec_and_test(&priv->restrict_refcnt)) if (atomic_dec_and_test(&priv->restrict_refcnt))
#endif #endif
_iwl4965_clear_bit(priv, CSR_GP_CNTRL, _iwl4965_clear_bit(priv, CSR_GP_CNTRL,
CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ); CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline void __iwl4965_release_nic_access(const char *f, u32 l, static inline void __iwl4965_release_nic_access(const char *f, u32 l,
struct iwl4965_priv *priv) struct iwl4965_priv *priv)
{ {
@@ -239,7 +239,7 @@ static inline u32 _iwl4965_read_direct32(struct iwl4965_priv *priv, u32 reg)
{ {
return _iwl4965_read32(priv, reg); return _iwl4965_read32(priv, reg);
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline u32 __iwl4965_read_direct32(const char *f, u32 l, static inline u32 __iwl4965_read_direct32(const char *f, u32 l,
struct iwl4965_priv *priv, u32 reg) struct iwl4965_priv *priv, u32 reg)
{ {
@@ -261,7 +261,7 @@ static inline void _iwl4965_write_direct32(struct iwl4965_priv *priv,
{ {
_iwl4965_write32(priv, reg, value); _iwl4965_write32(priv, reg, value);
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static void __iwl4965_write_direct32(u32 line, static void __iwl4965_write_direct32(u32 line,
struct iwl4965_priv *priv, u32 reg, u32 value) struct iwl4965_priv *priv, u32 reg, u32 value)
{ {
@@ -301,7 +301,7 @@ static inline int _iwl4965_poll_direct_bit(struct iwl4965_priv *priv,
return -ETIMEDOUT; return -ETIMEDOUT;
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline int __iwl4965_poll_direct_bit(const char *f, u32 l, static inline int __iwl4965_poll_direct_bit(const char *f, u32 l,
struct iwl4965_priv *priv, struct iwl4965_priv *priv,
u32 addr, u32 mask, int timeout) u32 addr, u32 mask, int timeout)
@@ -327,7 +327,7 @@ static inline u32 _iwl4965_read_prph(struct iwl4965_priv *priv, u32 reg)
_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24)); _iwl4965_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
return _iwl4965_read_direct32(priv, HBUS_TARG_PRPH_RDAT); return _iwl4965_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline u32 __iwl4965_read_prph(u32 line, struct iwl4965_priv *priv, u32 reg) static inline u32 __iwl4965_read_prph(u32 line, struct iwl4965_priv *priv, u32 reg)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
@@ -348,7 +348,7 @@ static inline void _iwl4965_write_prph(struct iwl4965_priv *priv,
((addr & 0x0000FFFF) | (3 << 24))); ((addr & 0x0000FFFF) | (3 << 24)));
_iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val); _iwl4965_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv, static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv,
u32 addr, u32 val) u32 addr, u32 val)
{ {
@@ -365,7 +365,7 @@ static inline void __iwl4965_write_prph(u32 line, struct iwl4965_priv *priv,
#define _iwl4965_set_bits_prph(priv, reg, mask) \ #define _iwl4965_set_bits_prph(priv, reg, mask) \
_iwl4965_write_prph(priv, reg, (_iwl4965_read_prph(priv, reg) | mask)) _iwl4965_write_prph(priv, reg, (_iwl4965_read_prph(priv, reg) | mask))
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv, static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv,
u32 reg, u32 mask) u32 reg, u32 mask)
{ {
@@ -383,7 +383,7 @@ static inline void __iwl4965_set_bits_prph(u32 line, struct iwl4965_priv *priv,
#define _iwl4965_set_bits_mask_prph(priv, reg, bits, mask) \ #define _iwl4965_set_bits_mask_prph(priv, reg, bits, mask) \
_iwl4965_write_prph(priv, reg, ((_iwl4965_read_prph(priv, reg) & mask) | bits)) _iwl4965_write_prph(priv, reg, ((_iwl4965_read_prph(priv, reg) & mask) | bits))
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static inline void __iwl4965_set_bits_mask_prph(u32 line, static inline void __iwl4965_set_bits_mask_prph(u32 line,
struct iwl4965_priv *priv, u32 reg, u32 bits, u32 mask) struct iwl4965_priv *priv, u32 reg, u32 bits, u32 mask)
{ {

4
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
View File

@@ -244,7 +244,7 @@ static inline u8 iwl4965_rate_get_rate(u32 rate_n_flags)
static int rs_send_lq_cmd(struct iwl4965_priv *priv, static int rs_send_lq_cmd(struct iwl4965_priv *priv,
struct iwl4965_link_quality_cmd *lq, u8 flags) struct iwl4965_link_quality_cmd *lq, u8 flags)
{ {
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
int i; int i;
#endif #endif
struct iwl4965_host_cmd cmd = { struct iwl4965_host_cmd cmd = {
@@ -265,7 +265,7 @@ static int rs_send_lq_cmd(struct iwl4965_priv *priv,
IWL_DEBUG_RATE("lq dta 0x%X 0x%X\n", IWL_DEBUG_RATE("lq dta 0x%X 0x%X\n",
lq->general_params.single_stream_ant_msk, lq->general_params.single_stream_ant_msk,
lq->general_params.dual_stream_ant_msk); lq->general_params.dual_stream_ant_msk);
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++) for (i = 0; i < LINK_QUAL_MAX_RETRY_NUM; i++)
IWL_DEBUG_RATE("lq index %d 0x%X\n", IWL_DEBUG_RATE("lq index %d 0x%X\n",
i, lq->rs_table[i].rate_n_flags); i, lq->rs_table[i].rate_n_flags);

6
drivers/net/wireless/iwlwifi/iwl-4965.c
View File

@@ -3583,7 +3583,7 @@ static void iwl4965_update_ps_mode(struct iwl4965_priv *priv, u16 ps_bit, u8 *ad
} }
} }
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
/** /**
* iwl4965_dbg_report_frame - dump frame to syslog during debug sessions * iwl4965_dbg_report_frame - dump frame to syslog during debug sessions
@@ -3623,7 +3623,7 @@ static void iwl4965_dbg_report_frame(struct iwl4965_priv *priv,
struct iwl4965_rx_frame_end *rx_end = IWL_RX_END(pkt); struct iwl4965_rx_frame_end *rx_end = IWL_RX_END(pkt);
u8 *data = IWL_RX_DATA(pkt); u8 *data = IWL_RX_DATA(pkt);
if (likely(!(iwl4965_debug_level & IWL_DL_RX))) if (likely(!(iwl_debug_level & IWL_DL_RX)))
return; return;
/* MAC header */ /* MAC header */
@@ -3726,7 +3726,7 @@ static void iwl4965_dbg_report_frame(struct iwl4965_priv *priv,
} }
} }
if (print_dump) if (print_dump)
iwl4965_print_hex_dump(IWL_DL_RX, data, length); iwl_print_hex_dump(IWL_DL_RX, data, length);
} }
#else #else
static inline void iwl4965_dbg_report_frame(struct iwl4965_priv *priv, static inline void iwl4965_dbg_report_frame(struct iwl4965_priv *priv,

4
drivers/net/wireless/iwlwifi/iwl-4965.h
View File

@@ -44,7 +44,7 @@ extern struct pci_device_id iwl4965_hw_card_ids[];
#include "iwl-4965-hw.h" #include "iwl-4965-hw.h"
#include "iwl-csr.h" #include "iwl-csr.h"
#include "iwl-prph.h" #include "iwl-prph.h"
#include "iwl-4965-debug.h" #include "iwl-debug.h"
/* Change firmware file name, using "-" and incrementing number, /* Change firmware file name, using "-" and incrementing number,
* *only* when uCode interface or architecture changes so that it * *only* when uCode interface or architecture changes so that it
@@ -1202,7 +1202,7 @@ struct iwl4965_priv {
u32 pm_state[16]; u32 pm_state[16];
#endif #endif
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
/* debugging info */ /* debugging info */
u32 framecnt_to_us; u32 framecnt_to_us;
atomic_t restrict_refcnt; atomic_t restrict_refcnt;

8
drivers/net/wireless/iwlwifi/iwl-core.c
View File

@@ -30,7 +30,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/version.h> #include <linux/version.h>
#include "iwl-4965-debug.h" #include "iwl-debug.h"
#include "iwl-eeprom.h" #include "iwl-eeprom.h"
#include "iwl-core.h" #include "iwl-core.h"
@@ -39,7 +39,7 @@ MODULE_VERSION(IWLWIFI_VERSION);
MODULE_AUTHOR(DRV_COPYRIGHT); MODULE_AUTHOR(DRV_COPYRIGHT);
MODULE_LICENSE("GPL/BSD"); MODULE_LICENSE("GPL/BSD");
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
u32 iwl4965_debug_level; u32 iwl_debug_level;
EXPORT_SYMBOL(iwl4965_debug_level); EXPORT_SYMBOL(iwl_debug_level);
#endif #endif

24
drivers/net/wireless/iwlwifi/iwl-4965-debug.h → drivers/net/wireless/iwlwifi/iwl-debug.h
View File

@@ -26,24 +26,24 @@
* *
*****************************************************************************/ *****************************************************************************/
#ifndef __iwl4965_debug_h__ #ifndef __iwl_debug_h__
#define __iwl4965_debug_h__ #define __iwl_debug_h__
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
extern u32 iwl4965_debug_level; extern u32 iwl_debug_level;
#define IWL_DEBUG(level, fmt, args...) \ #define IWL_DEBUG(level, fmt, args...) \
do { if (iwl4965_debug_level & (level)) \ do { if (iwl_debug_level & (level)) \
printk(KERN_ERR DRV_NAME": %c %s " fmt, \ printk(KERN_ERR DRV_NAME": %c %s " fmt, \
in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
#define IWL_DEBUG_LIMIT(level, fmt, args...) \ #define IWL_DEBUG_LIMIT(level, fmt, args...) \
do { if ((iwl4965_debug_level & (level)) && net_ratelimit()) \ do { if ((iwl_debug_level & (level)) && net_ratelimit()) \
printk(KERN_ERR DRV_NAME": %c %s " fmt, \ printk(KERN_ERR DRV_NAME": %c %s " fmt, \
in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0) in_interrupt() ? 'I' : 'U', __FUNCTION__ , ## args); } while (0)
static inline void iwl4965_print_hex_dump(int level, void *p, u32 len) static inline void iwl_print_hex_dump(int level, void *p, u32 len)
{ {
if (!(iwl4965_debug_level & level)) if (!(iwl_debug_level & level))
return; return;
print_hex_dump(KERN_DEBUG, "iwl data: ", DUMP_PREFIX_OFFSET, 16, 1, print_hex_dump(KERN_DEBUG, "iwl data: ", DUMP_PREFIX_OFFSET, 16, 1,
@@ -57,10 +57,10 @@ static inline void IWL_DEBUG(int level, const char *fmt, ...)
static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...) static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...)
{ {
} }
static inline void iwl4965_print_hex_dump(int level, void *p, u32 len) static inline void iwl_print_hex_dump(int level, void *p, u32 len)
{ {
} }
#endif /* CONFIG_IWL4965_DEBUG */ #endif /* CONFIG_IWLWIFI_DEBUG */
@@ -83,10 +83,10 @@ static inline void iwl4965_print_hex_dump(int level, void *p, u32 len)
* *
* % cat /proc/net/iwl/debug_level * % cat /proc/net/iwl/debug_level
* *
* you simply need to add your entry to the iwl4965_debug_levels array. * you simply need to add your entry to the iwl_debug_levels array.
* *
* If you do not see debug_level in /proc/net/iwl then you do not have * If you do not see debug_level in /proc/net/iwl then you do not have
* CONFIG_IWL4965_DEBUG defined in your kernel configuration * CONFIG_IWLWIFI_DEBUG defined in your kernel configuration
* *
*/ */

2
drivers/net/wireless/iwlwifi/iwl-eeprom.c
View File

@@ -71,7 +71,7 @@
#include "iwl-4965-commands.h" #include "iwl-4965-commands.h"
#include "iwl-4965.h" #include "iwl-4965.h"
#include "iwl-core.h" #include "iwl-core.h"
#include "iwl-4965-debug.h" #include "iwl-debug.h"
#include "iwl-eeprom.h" #include "iwl-eeprom.h"
#include "iwl-4965-io.h" #include "iwl-4965-io.h"

56
drivers/net/wireless/iwlwifi/iwl4965-base.c
View File

@@ -76,7 +76,7 @@ int iwl4965_param_amsdu_size_8K; /* def: enable 8K amsdu size */
#define DRV_DESCRIPTION "Intel(R) Wireless WiFi Link 4965AGN driver for Linux" #define DRV_DESCRIPTION "Intel(R) Wireless WiFi Link 4965AGN driver for Linux"
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
#define VD "d" #define VD "d"
#else #else
#define VD #define VD
@@ -2578,7 +2578,7 @@ static int iwl4965_get_sta_id(struct iwl4965_priv *priv,
IWL_DEBUG_DROP("Station %s not in station map. " IWL_DEBUG_DROP("Station %s not in station map. "
"Defaulting to broadcast...\n", "Defaulting to broadcast...\n",
print_mac(mac, hdr->addr1)); print_mac(mac, hdr->addr1));
iwl4965_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr)); iwl_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
return priv->hw_setting.bcast_sta_id; return priv->hw_setting.bcast_sta_id;
default: default:
@@ -2634,7 +2634,7 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
fc = le16_to_cpu(hdr->frame_control); fc = le16_to_cpu(hdr->frame_control);
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
if (ieee80211_is_auth(fc)) if (ieee80211_is_auth(fc))
IWL_DEBUG_TX("Sending AUTH frame\n"); IWL_DEBUG_TX("Sending AUTH frame\n");
else if (ieee80211_is_assoc_request(fc)) else if (ieee80211_is_assoc_request(fc))
@@ -2792,10 +2792,10 @@ static int iwl4965_tx_skb(struct iwl4965_priv *priv,
txq->need_update = 0; txq->need_update = 0;
} }
iwl4965_print_hex_dump(IWL_DL_TX, out_cmd->cmd.payload, iwl_print_hex_dump(IWL_DL_TX, out_cmd->cmd.payload,
sizeof(out_cmd->cmd.tx)); sizeof(out_cmd->cmd.tx));
iwl4965_print_hex_dump(IWL_DL_TX, (u8 *)out_cmd->cmd.tx.hdr, iwl_print_hex_dump(IWL_DL_TX, (u8 *)out_cmd->cmd.tx.hdr,
ieee80211_get_hdrlen(fc)); ieee80211_get_hdrlen(fc));
/* Set up entry for this TFD in Tx byte-count array */ /* Set up entry for this TFD in Tx byte-count array */
@@ -3590,7 +3590,7 @@ static void iwl4965_rx_spectrum_measure_notif(struct iwl4965_priv *priv,
static void iwl4965_rx_pm_sleep_notif(struct iwl4965_priv *priv, static void iwl4965_rx_pm_sleep_notif(struct iwl4965_priv *priv,
struct iwl4965_rx_mem_buffer *rxb) struct iwl4965_rx_mem_buffer *rxb)
{ {
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data; struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
struct iwl4965_sleep_notification *sleep = &(pkt->u.sleep_notif); struct iwl4965_sleep_notification *sleep = &(pkt->u.sleep_notif);
IWL_DEBUG_RX("sleep mode: %d, src: %d\n", IWL_DEBUG_RX("sleep mode: %d, src: %d\n",
@@ -3605,7 +3605,7 @@ static void iwl4965_rx_pm_debug_statistics_notif(struct iwl4965_priv *priv,
IWL_DEBUG_RADIO("Dumping %d bytes of unhandled " IWL_DEBUG_RADIO("Dumping %d bytes of unhandled "
"notification for %s:\n", "notification for %s:\n",
le32_to_cpu(pkt->len), get_cmd_string(pkt->hdr.cmd)); le32_to_cpu(pkt->len), get_cmd_string(pkt->hdr.cmd));
iwl4965_print_hex_dump(IWL_DL_RADIO, pkt->u.raw, le32_to_cpu(pkt->len)); iwl_print_hex_dump(IWL_DL_RADIO, pkt->u.raw, le32_to_cpu(pkt->len));
} }
static void iwl4965_bg_beacon_update(struct work_struct *work) static void iwl4965_bg_beacon_update(struct work_struct *work)
@@ -3636,7 +3636,7 @@ static void iwl4965_bg_beacon_update(struct work_struct *work)
static void iwl4965_rx_beacon_notif(struct iwl4965_priv *priv, static void iwl4965_rx_beacon_notif(struct iwl4965_priv *priv,
struct iwl4965_rx_mem_buffer *rxb) struct iwl4965_rx_mem_buffer *rxb)
{ {
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data; struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
struct iwl4965_beacon_notif *beacon = &(pkt->u.beacon_status); struct iwl4965_beacon_notif *beacon = &(pkt->u.beacon_status);
u8 rate = iwl4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags); u8 rate = iwl4965_hw_get_rate(beacon->beacon_notify_hdr.rate_n_flags);
@@ -3659,7 +3659,7 @@ static void iwl4965_rx_beacon_notif(struct iwl4965_priv *priv,
static void iwl4965_rx_reply_scan(struct iwl4965_priv *priv, static void iwl4965_rx_reply_scan(struct iwl4965_priv *priv,
struct iwl4965_rx_mem_buffer *rxb) struct iwl4965_rx_mem_buffer *rxb)
{ {
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data; struct iwl4965_rx_packet *pkt = (void *)rxb->skb->data;
struct iwl4965_scanreq_notification *notif = struct iwl4965_scanreq_notification *notif =
(struct iwl4965_scanreq_notification *)pkt->u.raw; (struct iwl4965_scanreq_notification *)pkt->u.raw;
@@ -4510,13 +4510,13 @@ static int iwl4965_tx_queue_update_write_ptr(struct iwl4965_priv *priv,
return rc; return rc;
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
static void iwl4965_print_rx_config_cmd(struct iwl4965_rxon_cmd *rxon) static void iwl4965_print_rx_config_cmd(struct iwl4965_rxon_cmd *rxon)
{ {
DECLARE_MAC_BUF(mac); DECLARE_MAC_BUF(mac);
IWL_DEBUG_RADIO("RX CONFIG:\n"); IWL_DEBUG_RADIO("RX CONFIG:\n");
iwl4965_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon)); iwl_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel)); IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
IWL_DEBUG_RADIO("u32 flags: 0x%08X\n", le32_to_cpu(rxon->flags)); IWL_DEBUG_RADIO("u32 flags: 0x%08X\n", le32_to_cpu(rxon->flags));
IWL_DEBUG_RADIO("u32 filter_flags: 0x%08x\n", IWL_DEBUG_RADIO("u32 filter_flags: 0x%08x\n",
@@ -4733,8 +4733,8 @@ static void iwl4965_irq_handle_error(struct iwl4965_priv *priv)
/* Cancel currently queued command. */ /* Cancel currently queued command. */
clear_bit(STATUS_HCMD_ACTIVE, &priv->status); clear_bit(STATUS_HCMD_ACTIVE, &priv->status);
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
if (iwl4965_debug_level & IWL_DL_FW_ERRORS) { if (iwl_debug_level & IWL_DL_FW_ERRORS) {
iwl4965_dump_nic_error_log(priv); iwl4965_dump_nic_error_log(priv);
iwl4965_dump_nic_event_log(priv); iwl4965_dump_nic_event_log(priv);
iwl4965_print_rx_config_cmd(&priv->staging_rxon); iwl4965_print_rx_config_cmd(&priv->staging_rxon);
@@ -4782,7 +4782,7 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
u32 inta, handled = 0; u32 inta, handled = 0;
u32 inta_fh; u32 inta_fh;
unsigned long flags; unsigned long flags;
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
u32 inta_mask; u32 inta_mask;
#endif #endif
@@ -4800,8 +4800,8 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
inta_fh = iwl4965_read32(priv, CSR_FH_INT_STATUS); inta_fh = iwl4965_read32(priv, CSR_FH_INT_STATUS);
iwl4965_write32(priv, CSR_FH_INT_STATUS, inta_fh); iwl4965_write32(priv, CSR_FH_INT_STATUS, inta_fh);
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
if (iwl4965_debug_level & IWL_DL_ISR) { if (iwl_debug_level & IWL_DL_ISR) {
/* just for debug */ /* just for debug */
inta_mask = iwl4965_read32(priv, CSR_INT_MASK); inta_mask = iwl4965_read32(priv, CSR_INT_MASK);
IWL_DEBUG_ISR("inta 0x%08x, enabled 0x%08x, fh 0x%08x\n", IWL_DEBUG_ISR("inta 0x%08x, enabled 0x%08x, fh 0x%08x\n",
@@ -4834,8 +4834,8 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
return; return;
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
if (iwl4965_debug_level & (IWL_DL_ISR)) { if (iwl_debug_level & (IWL_DL_ISR)) {
/* NIC fires this, but we don't use it, redundant with WAKEUP */ /* NIC fires this, but we don't use it, redundant with WAKEUP */
if (inta & CSR_INT_BIT_SCD) if (inta & CSR_INT_BIT_SCD)
IWL_DEBUG_ISR("Scheduler finished to transmit " IWL_DEBUG_ISR("Scheduler finished to transmit "
@@ -4925,8 +4925,8 @@ static void iwl4965_irq_tasklet(struct iwl4965_priv *priv)
/* Re-enable all interrupts */ /* Re-enable all interrupts */
iwl4965_enable_interrupts(priv); iwl4965_enable_interrupts(priv);
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
if (iwl4965_debug_level & (IWL_DL_ISR)) { if (iwl_debug_level & (IWL_DL_ISR)) {
inta = iwl4965_read32(priv, CSR_INT); inta = iwl4965_read32(priv, CSR_INT);
inta_mask = iwl4965_read32(priv, CSR_INT_MASK); inta_mask = iwl4965_read32(priv, CSR_INT_MASK);
inta_fh = iwl4965_read32(priv, CSR_FH_INT_STATUS); inta_fh = iwl4965_read32(priv, CSR_FH_INT_STATUS);
@@ -7916,7 +7916,7 @@ static int iwl4965_mac_conf_ht(struct ieee80211_hw *hw,
* *
*****************************************************************************/ *****************************************************************************/
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
/* /*
* The following adds a new attribute to the sysfs representation * The following adds a new attribute to the sysfs representation
@@ -7928,7 +7928,7 @@ static int iwl4965_mac_conf_ht(struct ieee80211_hw *hw,
static ssize_t show_debug_level(struct device_driver *d, char *buf) static ssize_t show_debug_level(struct device_driver *d, char *buf)
{ {
return sprintf(buf, "0x%08X\n", iwl4965_debug_level); return sprintf(buf, "0x%08X\n", iwl_debug_level);
} }
static ssize_t store_debug_level(struct device_driver *d, static ssize_t store_debug_level(struct device_driver *d,
const char *buf, size_t count) const char *buf, size_t count)
@@ -7941,7 +7941,7 @@ static ssize_t store_debug_level(struct device_driver *d,
printk(KERN_INFO DRV_NAME printk(KERN_INFO DRV_NAME
": %s is not in hex or decimal form.\n", buf); ": %s is not in hex or decimal form.\n", buf);
else else
iwl4965_debug_level = val; iwl_debug_level = val;
return strnlen(buf, count); return strnlen(buf, count);
} }
@@ -7949,7 +7949,7 @@ static ssize_t store_debug_level(struct device_driver *d,
static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO, static DRIVER_ATTR(debug_level, S_IWUSR | S_IRUGO,
show_debug_level, store_debug_level); show_debug_level, store_debug_level);
#endif /* CONFIG_IWL4965_DEBUG */ #endif /* CONFIG_IWLWIFI_DEBUG */
static ssize_t show_rf_kill(struct device *d, static ssize_t show_rf_kill(struct device *d,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
@@ -8548,8 +8548,8 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
priv->pci_dev = pdev; priv->pci_dev = pdev;
priv->antenna = (enum iwl4965_antenna)iwl4965_param_antenna; priv->antenna = (enum iwl4965_antenna)iwl4965_param_antenna;
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
iwl4965_debug_level = iwl4965_param_debug; iwl_debug_level = iwl4965_param_debug;
atomic_set(&priv->restrict_refcnt, 0); atomic_set(&priv->restrict_refcnt, 0);
#endif #endif
priv->retry_rate = 1; priv->retry_rate = 1;
@@ -8878,7 +8878,7 @@ static int __init iwl4965_init(void)
IWL_ERROR("Unable to initialize PCI module\n"); IWL_ERROR("Unable to initialize PCI module\n");
return ret; return ret;
} }
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
ret = driver_create_file(&iwl4965_driver.driver, &driver_attr_debug_level); ret = driver_create_file(&iwl4965_driver.driver, &driver_attr_debug_level);
if (ret) { if (ret) {
IWL_ERROR("Unable to create driver sysfs file\n"); IWL_ERROR("Unable to create driver sysfs file\n");
@@ -8892,7 +8892,7 @@ static int __init iwl4965_init(void)
static void __exit iwl4965_exit(void) static void __exit iwl4965_exit(void)
{ {
#ifdef CONFIG_IWL4965_DEBUG #ifdef CONFIG_IWLWIFI_DEBUG
driver_remove_file(&iwl4965_driver.driver, &driver_attr_debug_level); driver_remove_file(&iwl4965_driver.driver, &driver_attr_debug_level);
#endif #endif
pci_unregister_driver(&iwl4965_driver); pci_unregister_driver(&iwl4965_driver);