Skip to content

L
linux
Commit c8b0e6e1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller
Browse files
Options

iwlwifi: cleanup Kconfig and ifdefs to split 3945 and 4965 

Currently the iwl3945 & iwl4965 drivers share some common Kconfig
symbols.  This split it up into options for the individual drivers
and gets rid of all the CONFIG_IWLWIFI cruft.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5d08cd1d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 368 additions and 336 deletions
drivers/net/wireless/Makefile
View file @ c8b0e6e1
...@@ -52,7 +52,8 @@ obj-$(CONFIG_RTL8187) += rtl8187.o ...@@ -52,7 +52,8 @@ obj-$(CONFIG_RTL8187) += rtl8187.o
obj-$(CONFIG_ADM8211) += adm8211.o obj-$(CONFIG_ADM8211) += adm8211.o
obj-$(CONFIG_IWLWIFI) += iwlwifi/ obj-$(CONFIG_IWL3945) += iwlwifi/
obj-$(CONFIG_IWL4965) += iwlwifi/
obj-$(CONFIG_RT2X00) += rt2x00/ obj-$(CONFIG_RT2X00) += rt2x00/
obj-$(CONFIG_P54_COMMON) += p54common.o obj-$(CONFIG_P54_COMMON) += p54common.o
......
drivers/net/wireless/iwlwifi/Kconfig
View file @ c8b0e6e1
config IWLWIFI config IWL4965
bool "Intel Wireless WiFi Link Drivers" tristate "Intel Wireless WiFi 4965AGN"
depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL depends on m && PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
select FW_LOADER select FW_LOADER
default n default m
---help---
Select to enable drivers based on the iwlwifi project. This
project provides a common foundation for Intel's wireless
drivers designed to use the mac80211 subsystem.
See <file:Documentation/networking/README.iwlwifi> for
information on the capabilities currently enabled in this
driver and for tips for debugging issues and problems.
config IWLWIFI_DEBUG
bool "Enable full debugging output in iwlwifi drivers"
depends on IWLWIFI
default y
---help--- ---help---
This option will enable debug tracing output for the iwlwifi Select to build the driver supporting the:
drivers.
This will result in the kernel module being ~100k larger. You can Intel Wireless WiFi Link 4965AGN
control which debug output is sent to the kernel log by setting the
value in
/sys/bus/pci/drivers/${DRIVER}/debug_level This driver uses the kernel's mac80211 subsystem.
This entry will only exist if this option is enabled. See <file:Documentation/networking/README.iwlwifi> for
information on the capabilities currently enabled in this
driver and for tips for debugging any issues or problems.
To set a value, simply echo an 8-byte hex value to the same file: In order to use this driver, you will need a microcode (uCode)
image for it. You can obtain the microcode from:
% echo 0x43fff > /sys/bus/pci/drivers/${DRIVER}/debug_level <http://intellinuxwireless.org/>.
You can find the list of debug mask values in: See the above referenced README.iwlwifi for information on where
drivers/net/wireless/mac80211/iwlwifi/iwl-debug.h to install the microcode images.
If this is your first time using this driver, you should say Y here If you want to compile the driver as a module ( = code which can be
as the debug information can assist others in helping you resolve inserted in and remvoed from the running kernel whenever you want),
any problems you may encounter. say M here and read <file:Documentation/kbuild/modules.txt>. The
module will be called iwl4965.ko.
config IWLWIFI_SENSITIVITY config IWL4965_QOS
bool "Enable Sensitivity Calibration in iwlwifi drivers" bool "Enable Wireless QoS in iwl4965 driver"
depends on IWLWIFI depends on IWL4965
default y default y
---help--- ---help---
This option will enable sensitivity calibration for the iwlwifi This option will enable wireless quality of service (QoS) for the
drivers. iw4965 driver.
config IWLWIFI_SPECTRUM_MEASUREMENT config IWL4965_SPECTRUM_MEASUREMENT
bool "Enable Spectrum Measurement in iwlwifi drivers" bool "Enable Spectrum Measurement in iw4965 driver"
depends on IWLWIFI depends on IWL4965
default y default y
---help--- ---help---
This option will enable spectrum measurement for the iwlwifi drivers. This option will enable spectrum measurement for the iwl4965 driver.
config IWLWIFI_QOS config IWL4965_SENSITIVITY
bool "Enable Wireless QoS in iwlwifi drivers" bool "Enable Sensitivity Calibration in iwl4965 driver"
depends on IWLWIFI depends on IWL4965
default y default y
---help--- ---help---
This option will enable wireless quality of service (QoS) for the This option will enable sensitivity calibration for the iwl4965
iwlwifi drivers. driver.
config IWLWIFI_HT config IWL4965_HT
bool "Enable 802.11n HT features in iwlwifi drivers" bool "Enable 802.11n HT features in iwl4965 driver"
depends on EXPERIMENTAL depends on EXPERIMENTAL
depends on IWLWIFI && MAC80211_HT depends on IWL4965 && MAC80211_HT
default n default n
---help--- ---help---
This option enables IEEE 802.11n High Throughput features This option enables IEEE 802.11n High Throughput features
for the iwlwifi drivers. for the iwl4965 driver.
config IWL4965 config IWL4965_DEBUG
tristate "Intel Wireless WiFi 4965AGN" bool "Enable full debugging output in iwl4965 driver"
depends on m && IWLWIFI && EXPERIMENTAL depends on IWL4965
default m default y
---help--- ---help---
Select to build the driver supporting the: This option will enable debug tracing output for the iwl4965
driver.
Intel Wireless WiFi Link 4965AGN This will result in the kernel module being ~100k larger. You can
control which debug output is sent to the kernel log by setting the
value in
This driver uses the kernel's mac80211 subsystem. /sys/bus/pci/drivers/${DRIVER}/debug_level
See <file:Documentation/networking/README.iwlwifi> for This entry will only exist if this option is enabled.
information on the capabilities currently enabled in this
driver and for tips for debugging any issues or problems.
In order to use this driver, you will need a microcode (uCode) To set a value, simply echo an 8-byte hex value to the same file:
image for it. You can obtain the microcode from:
<http://intellinuxwireless.org/>. % echo 0x43fff > /sys/bus/pci/drivers/${DRIVER}/debug_level
See the above referenced README.iwlwifi for information on where You can find the list of debug mask values in:
to install the microcode images. drivers/net/wireless/iwlwifi/iwl-4965-debug.h
If you want to compile the driver as a module ( = code which can be If this is your first time using this driver, you should say Y here
inserted in and remvoed from the running kernel whenever you want), as the debug information can assist others in helping you resolve
say M here and read <file:Documentation/kbuild/modules.txt>. The any problems you may encounter.
module will be called iwl4965.ko.
config IWL3945 config IWL3945
tristate "Intel PRO/Wireless 3945ABG/BG Network Connection" tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"
depends on m && IWLWIFI && EXPERIMENTAL depends on m && PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL
select FW_LOADER
default m default m
---help--- ---help---
Select to build the driver supporting the: Select to build the driver supporting the:
...@@ -126,3 +114,46 @@ config IWL3945 ...@@ -126,3 +114,46 @@ config IWL3945
inserted in and remvoed from the running kernel whenever you want), inserted in and remvoed from the running kernel whenever you want),
say M here and read <file:Documentation/kbuild/modules.txt>. The say M here and read <file:Documentation/kbuild/modules.txt>. The
module will be called iwl3945.ko. module will be called iwl3945.ko.
config IWL3945_QOS
bool "Enable Wireless QoS in iwl3945 driver"
depends on IWL3945
default y
---help---
This option will enable wireless quality of service (QoS) for the
iwl3945 driver.
config IWL3945_SPECTRUM_MEASUREMENT
bool "Enable Spectrum Measurement in iwl3945 drivers"
depends on IWL3945
default y
---help---
This option will enable spectrum measurement for the iwl3945 driver.
config IWL3945_DEBUG
bool "Enable full debugging output in iwl3945 driver"
depends on IWL3945
default y
---help---
This option will enable debug tracing output for the iwl3945
driver.
This will result in the kernel module being ~100k larger. You can
control which debug output is sent to the kernel log by setting the
value in
/sys/bus/pci/drivers/${DRIVER}/debug_level
This entry will only exist if this option is enabled.
To set a value, simply echo an 8-byte hex value to the same file:
% echo 0x43fff > /sys/bus/pci/drivers/${DRIVER}/debug_level
You can find the list of debug mask values in:
drivers/net/wireless/iwlwifi/iwl-3945-debug.h
If this is your first time using this driver, you should say Y here
as the debug information can assist others in helping you resolve
any problems you may encounter.
drivers/net/wireless/iwlwifi/iwl-3945-debug.h
View file @ c8b0e6e1
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef __iwl_debug_h__ #ifndef __iwl_debug_h__
#define __iwl_debug_h__ #define __iwl_debug_h__
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
extern u32 iwl_debug_level; extern u32 iwl_debug_level;
#define IWL_DEBUG(level, fmt, args...) \ #define IWL_DEBUG(level, fmt, args...) \
do { if (iwl_debug_level & (level)) \ do { if (iwl_debug_level & (level)) \
...@@ -47,7 +47,7 @@ static inline void IWL_DEBUG(int level, const char *fmt, ...) ...@@ -47,7 +47,7 @@ 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, ...)
{ {
} }
#endif /* CONFIG_IWLWIFI_DEBUG */ #endif /* CONFIG_IWL3945_DEBUG */
/* /*
* To use the debug system; * To use the debug system;
...@@ -71,7 +71,7 @@ static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...) ...@@ -71,7 +71,7 @@ static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...)
* you simply need to add your entry to the iwl_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_IWLWIFI_DEBUG defined in your kernel configuration * CONFIG_IWL3945_DEBUG defined in your kernel configuration
* *
*/ */
......
drivers/net/wireless/iwlwifi/iwl-3945-io.h
View file @ c8b0e6e1
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
*/ */
#define _iwl_write32(iwl, ofs, val) writel((val), (iwl)->hw_base + (ofs)) #define _iwl_write32(iwl, ofs, val) writel((val), (iwl)->hw_base + (ofs))
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl, static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl,
u32 ofs, u32 val) u32 ofs, u32 val)
{ {
...@@ -74,7 +74,7 @@ static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl, ...@@ -74,7 +74,7 @@ static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl,
#endif #endif
#define _iwl_read32(iwl, ofs) readl((iwl)->hw_base + (ofs)) #define _iwl_read32(iwl, ofs) readl((iwl)->hw_base + (ofs))
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *iwl, u32 ofs) static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *iwl, 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 _iwl_poll_bit(struct iwl_priv *priv, u32 addr, ...@@ -99,7 +99,7 @@ static inline int _iwl_poll_bit(struct iwl_priv *priv, u32 addr,
return -ETIMEDOUT; return -ETIMEDOUT;
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline int __iwl_poll_bit(const char *f, u32 l, static inline int __iwl_poll_bit(const char *f, u32 l,
struct iwl_priv *priv, u32 addr, struct iwl_priv *priv, u32 addr,
u32 bits, u32 mask, int timeout) u32 bits, u32 mask, int timeout)
...@@ -125,7 +125,7 @@ static inline void _iwl_set_bit(struct iwl_priv *priv, u32 reg, u32 mask) ...@@ -125,7 +125,7 @@ static inline void _iwl_set_bit(struct iwl_priv *priv, u32 reg, u32 mask)
{ {
_iwl_write32(priv, reg, _iwl_read32(priv, reg) | mask); _iwl_write32(priv, reg, _iwl_read32(priv, reg) | mask);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl_set_bit(const char *f, u32 l, static inline void __iwl_set_bit(const char *f, u32 l,
struct iwl_priv *priv, u32 reg, u32 mask) struct iwl_priv *priv, u32 reg, u32 mask)
{ {
...@@ -142,7 +142,7 @@ static inline void _iwl_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask) ...@@ -142,7 +142,7 @@ static inline void _iwl_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask)
{ {
_iwl_write32(priv, reg, _iwl_read32(priv, reg) & ~mask); _iwl_write32(priv, reg, _iwl_read32(priv, reg) & ~mask);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl_clear_bit(const char *f, u32 l, static inline void __iwl_clear_bit(const char *f, u32 l,
struct iwl_priv *priv, u32 reg, u32 mask) struct iwl_priv *priv, u32 reg, u32 mask)
{ {
...@@ -160,7 +160,7 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv) ...@@ -160,7 +160,7 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
int ret; int ret;
u32 gp_ctl; u32 gp_ctl;
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
if (atomic_read(&priv->restrict_refcnt)) if (atomic_read(&priv->restrict_refcnt))
return 0; return 0;
#endif #endif
...@@ -191,13 +191,13 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv) ...@@ -191,13 +191,13 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
return -EIO; return -EIO;
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
atomic_inc(&priv->restrict_refcnt); atomic_inc(&priv->restrict_refcnt);
#endif #endif
return 0; return 0;
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline int __iwl_grab_nic_access(const char *f, u32 l, static inline int __iwl_grab_nic_access(const char *f, u32 l,
struct iwl_priv *priv) struct iwl_priv *priv)
{ {
...@@ -217,13 +217,13 @@ static inline int __iwl_grab_nic_access(const char *f, u32 l, ...@@ -217,13 +217,13 @@ static inline int __iwl_grab_nic_access(const char *f, u32 l,
static inline void _iwl_release_nic_access(struct iwl_priv *priv) static inline void _iwl_release_nic_access(struct iwl_priv *priv)
{ {
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
if (atomic_dec_and_test(&priv->restrict_refcnt)) if (atomic_dec_and_test(&priv->restrict_refcnt))
#endif #endif
_iwl_clear_bit(priv, CSR_GP_CNTRL, _iwl_clear_bit(priv, CSR_GP_CNTRL,
CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ); CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl_release_nic_access(const char *f, u32 l, static inline void __iwl_release_nic_access(const char *f, u32 l,
struct iwl_priv *priv) struct iwl_priv *priv)
{ {
...@@ -244,7 +244,7 @@ static inline u32 _iwl_read_direct32(struct iwl_priv *priv, u32 reg) ...@@ -244,7 +244,7 @@ static inline u32 _iwl_read_direct32(struct iwl_priv *priv, u32 reg)
{ {
return _iwl_read32(priv, reg); return _iwl_read32(priv, reg);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline u32 __iwl_read_direct32(const char *f, u32 l, static inline u32 __iwl_read_direct32(const char *f, u32 l,
struct iwl_priv *priv, u32 reg) struct iwl_priv *priv, u32 reg)
{ {
...@@ -266,7 +266,7 @@ static inline void _iwl_write_direct32(struct iwl_priv *priv, ...@@ -266,7 +266,7 @@ static inline void _iwl_write_direct32(struct iwl_priv *priv,
{ {
_iwl_write32(priv, reg, value); _iwl_write32(priv, reg, value);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static void __iwl_write_direct32(u32 line, static void __iwl_write_direct32(u32 line,
struct iwl_priv *priv, u32 reg, u32 value) struct iwl_priv *priv, u32 reg, u32 value)
{ {
...@@ -306,7 +306,7 @@ static inline int _iwl_poll_direct_bit(struct iwl_priv *priv, ...@@ -306,7 +306,7 @@ static inline int _iwl_poll_direct_bit(struct iwl_priv *priv,
return -ETIMEDOUT; return -ETIMEDOUT;
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline int __iwl_poll_direct_bit(const char *f, u32 l, static inline int __iwl_poll_direct_bit(const char *f, u32 l,
struct iwl_priv *priv, struct iwl_priv *priv,
u32 addr, u32 mask, int timeout) u32 addr, u32 mask, int timeout)
...@@ -332,7 +332,7 @@ static inline u32 _iwl_read_prph(struct iwl_priv *priv, u32 reg) ...@@ -332,7 +332,7 @@ static inline u32 _iwl_read_prph(struct iwl_priv *priv, u32 reg)
_iwl_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24)); _iwl_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
return _iwl_read_direct32(priv, HBUS_TARG_PRPH_RDAT); return _iwl_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline u32 __iwl_read_prph(u32 line, struct iwl_priv *priv, u32 reg) static inline u32 __iwl_read_prph(u32 line, struct iwl_priv *priv, u32 reg)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
...@@ -353,7 +353,7 @@ static inline void _iwl_write_prph(struct iwl_priv *priv, ...@@ -353,7 +353,7 @@ static inline void _iwl_write_prph(struct iwl_priv *priv,
((addr & 0x0000FFFF) | (3 << 24))); ((addr & 0x0000FFFF) | (3 << 24)));
_iwl_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val); _iwl_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv, static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv,
u32 addr, u32 val) u32 addr, u32 val)
{ {
...@@ -370,7 +370,7 @@ static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv, ...@@ -370,7 +370,7 @@ static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv,
#define _iwl_set_bits_prph(priv, reg, mask) \ #define _iwl_set_bits_prph(priv, reg, mask) \
_iwl_write_prph(priv, reg, (_iwl_read_prph(priv, reg) | mask)) _iwl_write_prph(priv, reg, (_iwl_read_prph(priv, reg) | mask))
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv, static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv,
u32 reg, u32 mask) u32 reg, u32 mask)
{ {
...@@ -388,7 +388,7 @@ static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv, ...@@ -388,7 +388,7 @@ static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv,
#define _iwl_set_bits_mask_prph(priv, reg, bits, mask) \ #define _iwl_set_bits_mask_prph(priv, reg, bits, mask) \
_iwl_write_prph(priv, reg, ((_iwl_read_prph(priv, reg) & mask) | bits)) _iwl_write_prph(priv, reg, ((_iwl_read_prph(priv, reg) & mask) | bits))
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
static inline void __iwl_set_bits_mask_prph(u32 line, static inline void __iwl_set_bits_mask_prph(u32 line,
struct iwl_priv *priv, u32 reg, u32 bits, u32 mask) struct iwl_priv *priv, u32 reg, u32 bits, u32 mask)
{ {
......
drivers/net/wireless/iwlwifi/iwl-3945.c
View file @ c8b0e6e1
...@@ -371,7 +371,7 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv, ...@@ -371,7 +371,7 @@ static void iwl3945_rx_reply_rx(struct iwl_priv *priv,
network_packet = iwl_is_network_packet(priv, header); network_packet = iwl_is_network_packet(priv, header);
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
if (iwl_debug_level & IWL_DL_STATS && net_ratelimit()) if (iwl_debug_level & IWL_DL_STATS && net_ratelimit())
IWL_DEBUG_STATS IWL_DEBUG_STATS
("[%c] %d RSSI: %d Signal: %u, Noise: %u, Rate: %u\n", ("[%c] %d RSSI: %d Signal: %u, Noise: %u, Rate: %u\n",
......
drivers/net/wireless/iwlwifi/iwl-3945.h
View file @ c8b0e6e1
...@@ -445,7 +445,7 @@ union iwl_ht_rate_supp { ...@@ -445,7 +445,7 @@ union iwl_ht_rate_supp {
}; };
}; };
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL3945_HT
#define CFG_HT_RX_AMPDU_FACTOR_DEF (0x3) #define CFG_HT_RX_AMPDU_FACTOR_DEF (0x3)
#define HT_IE_MAX_AMSDU_SIZE_4K (0) #define HT_IE_MAX_AMSDU_SIZE_4K (0)
#define CFG_HT_MPDU_DENSITY_2USEC (0x5) #define CFG_HT_MPDU_DENSITY_2USEC (0x5)
...@@ -468,9 +468,9 @@ struct sta_ht_info { ...@@ -468,9 +468,9 @@ struct sta_ht_info {
u8 tx_chan_width; u8 tx_chan_width;
u8 chan_width_cap; u8 chan_width_cap;
}; };
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL3945_HT */
#ifdef CONFIG_IWLWIFI_QOS #ifdef CONFIG_IWL3945_QOS
union iwl_qos_capabity { union iwl_qos_capabity {
struct { struct {
...@@ -499,7 +499,7 @@ struct iwl_qos_info { ...@@ -499,7 +499,7 @@ struct iwl_qos_info {
union iwl_qos_capabity qos_cap; union iwl_qos_capabity qos_cap;
struct iwl_qosparam_cmd def_qos_parm; struct iwl_qosparam_cmd def_qos_parm;
}; };
#endif /*CONFIG_IWLWIFI_QOS */ #endif /*CONFIG_IWL3945_QOS */
#define STA_PS_STATUS_WAKE 0 #define STA_PS_STATUS_WAKE 0
#define STA_PS_STATUS_SLEEP 1 #define STA_PS_STATUS_SLEEP 1
...@@ -598,7 +598,7 @@ extern int iwl_is_network_packet(struct iwl_priv *priv, ...@@ -598,7 +598,7 @@ extern int iwl_is_network_packet(struct iwl_priv *priv,
struct ieee80211_hdr *header); struct ieee80211_hdr *header);
extern int iwl_power_init_handle(struct iwl_priv *priv); extern int iwl_power_init_handle(struct iwl_priv *priv);
extern int iwl_eeprom_init(struct iwl_priv *priv); extern int iwl_eeprom_init(struct iwl_priv *priv);
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
extern void iwl_report_frame(struct iwl_priv *priv, extern void iwl_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);
...@@ -717,7 +717,7 @@ extern u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id, ...@@ -717,7 +717,7 @@ extern u8 iwl3945_sync_sta(struct iwl_priv *priv, int sta_id,
u16 tx_rate, u8 flags); u16 tx_rate, u8 flags);
#ifdef CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT #ifdef CONFIG_IWL3945_SPECTRUM_MEASUREMENT
enum { enum {
MEASUREMENT_READY = (1 << 0), MEASUREMENT_READY = (1 << 0),
...@@ -745,7 +745,7 @@ struct iwl_priv { ...@@ -745,7 +745,7 @@ struct iwl_priv {
const struct ieee80211_hw_mode *modes; const struct ieee80211_hw_mode *modes;
#ifdef CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT #ifdef 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;
...@@ -904,9 +904,9 @@ struct iwl_priv { ...@@ -904,9 +904,9 @@ struct iwl_priv {
u16 assoc_capability; u16 assoc_capability;
u8 ps_mode; u8 ps_mode;
#ifdef CONFIG_IWLWIFI_QOS #ifdef CONFIG_IWL3945_QOS
struct iwl_qos_info qos_data; struct iwl_qos_info qos_data;
#endif /*CONFIG_IWLWIFI_QOS */ #endif /*CONFIG_IWL3945_QOS */
struct workqueue_struct *workqueue; struct workqueue_struct *workqueue;
...@@ -941,7 +941,7 @@ struct iwl_priv { ...@@ -941,7 +941,7 @@ struct iwl_priv {
u32 pm_state[16]; u32 pm_state[16];
#endif #endif
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL3945_DEBUG
/* debugging info */ /* debugging info */
u32 framecnt_to_us; u32 framecnt_to_us;
atomic_t restrict_refcnt; atomic_t restrict_refcnt;
......
drivers/net/wireless/iwlwifi/iwl-4965-debug.h
View file @ c8b0e6e1
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#ifndef __iwl_debug_h__ #ifndef __iwl_debug_h__
#define __iwl_debug_h__ #define __iwl_debug_h__
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
extern u32 iwl_debug_level; extern u32 iwl_debug_level;
#define IWL_DEBUG(level, fmt, args...) \ #define IWL_DEBUG(level, fmt, args...) \
do { if (iwl_debug_level & (level)) \ do { if (iwl_debug_level & (level)) \
...@@ -47,7 +47,7 @@ static inline void IWL_DEBUG(int level, const char *fmt, ...) ...@@ -47,7 +47,7 @@ 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, ...)
{ {
} }
#endif /* CONFIG_IWLWIFI_DEBUG */ #endif /* CONFIG_IWL4965_DEBUG */
/* /*
* To use the debug system; * To use the debug system;
...@@ -71,7 +71,7 @@ static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...) ...@@ -71,7 +71,7 @@ static inline void IWL_DEBUG_LIMIT(int level, const char *fmt, ...)
* you simply need to add your entry to the iwl_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_IWLWIFI_DEBUG defined in your kernel configuration * CONFIG_IWL4965_DEBUG defined in your kernel configuration
* *
*/ */
......
drivers/net/wireless/iwlwifi/iwl-4965-io.h
View file @ c8b0e6e1
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
*/ */
#define _iwl_write32(iwl, ofs, val) writel((val), (iwl)->hw_base + (ofs)) #define _iwl_write32(iwl, ofs, val) writel((val), (iwl)->hw_base + (ofs))
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl, static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl,
u32 ofs, u32 val) u32 ofs, u32 val)
{ {
...@@ -74,7 +74,7 @@ static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl, ...@@ -74,7 +74,7 @@ static inline void __iwl_write32(const char *f, u32 l, struct iwl_priv *iwl,
#endif #endif
#define _iwl_read32(iwl, ofs) readl((iwl)->hw_base + (ofs)) #define _iwl_read32(iwl, ofs) readl((iwl)->hw_base + (ofs))
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *iwl, u32 ofs) static inline u32 __iwl_read32(char *f, u32 l, struct iwl_priv *iwl, 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 _iwl_poll_bit(struct iwl_priv *priv, u32 addr, ...@@ -99,7 +99,7 @@ static inline int _iwl_poll_bit(struct iwl_priv *priv, u32 addr,
return -ETIMEDOUT; return -ETIMEDOUT;
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline int __iwl_poll_bit(const char *f, u32 l, static inline int __iwl_poll_bit(const char *f, u32 l,
struct iwl_priv *priv, u32 addr, struct iwl_priv *priv, u32 addr,
u32 bits, u32 mask, int timeout) u32 bits, u32 mask, int timeout)
...@@ -125,7 +125,7 @@ static inline void _iwl_set_bit(struct iwl_priv *priv, u32 reg, u32 mask) ...@@ -125,7 +125,7 @@ static inline void _iwl_set_bit(struct iwl_priv *priv, u32 reg, u32 mask)
{ {
_iwl_write32(priv, reg, _iwl_read32(priv, reg) | mask); _iwl_write32(priv, reg, _iwl_read32(priv, reg) | mask);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline void __iwl_set_bit(const char *f, u32 l, static inline void __iwl_set_bit(const char *f, u32 l,
struct iwl_priv *priv, u32 reg, u32 mask) struct iwl_priv *priv, u32 reg, u32 mask)
{ {
...@@ -142,7 +142,7 @@ static inline void _iwl_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask) ...@@ -142,7 +142,7 @@ static inline void _iwl_clear_bit(struct iwl_priv *priv, u32 reg, u32 mask)
{ {
_iwl_write32(priv, reg, _iwl_read32(priv, reg) & ~mask); _iwl_write32(priv, reg, _iwl_read32(priv, reg) & ~mask);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline void __iwl_clear_bit(const char *f, u32 l, static inline void __iwl_clear_bit(const char *f, u32 l,
struct iwl_priv *priv, u32 reg, u32 mask) struct iwl_priv *priv, u32 reg, u32 mask)
{ {
...@@ -160,7 +160,7 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv) ...@@ -160,7 +160,7 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
int ret; int ret;
u32 gp_ctl; u32 gp_ctl;
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
if (atomic_read(&priv->restrict_refcnt)) if (atomic_read(&priv->restrict_refcnt))
return 0; return 0;
#endif #endif
...@@ -191,13 +191,13 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv) ...@@ -191,13 +191,13 @@ static inline int _iwl_grab_nic_access(struct iwl_priv *priv)
return -EIO; return -EIO;
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
atomic_inc(&priv->restrict_refcnt); atomic_inc(&priv->restrict_refcnt);
#endif #endif
return 0; return 0;
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline int __iwl_grab_nic_access(const char *f, u32 l, static inline int __iwl_grab_nic_access(const char *f, u32 l,
struct iwl_priv *priv) struct iwl_priv *priv)
{ {
...@@ -217,13 +217,13 @@ static inline int __iwl_grab_nic_access(const char *f, u32 l, ...@@ -217,13 +217,13 @@ static inline int __iwl_grab_nic_access(const char *f, u32 l,
static inline void _iwl_release_nic_access(struct iwl_priv *priv) static inline void _iwl_release_nic_access(struct iwl_priv *priv)
{ {
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
if (atomic_dec_and_test(&priv->restrict_refcnt)) if (atomic_dec_and_test(&priv->restrict_refcnt))
#endif #endif
_iwl_clear_bit(priv, CSR_GP_CNTRL, _iwl_clear_bit(priv, CSR_GP_CNTRL,
CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ); CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline void __iwl_release_nic_access(const char *f, u32 l, static inline void __iwl_release_nic_access(const char *f, u32 l,
struct iwl_priv *priv) struct iwl_priv *priv)
{ {
...@@ -244,7 +244,7 @@ static inline u32 _iwl_read_direct32(struct iwl_priv *priv, u32 reg) ...@@ -244,7 +244,7 @@ static inline u32 _iwl_read_direct32(struct iwl_priv *priv, u32 reg)
{ {
return _iwl_read32(priv, reg); return _iwl_read32(priv, reg);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline u32 __iwl_read_direct32(const char *f, u32 l, static inline u32 __iwl_read_direct32(const char *f, u32 l,
struct iwl_priv *priv, u32 reg) struct iwl_priv *priv, u32 reg)
{ {
...@@ -266,7 +266,7 @@ static inline void _iwl_write_direct32(struct iwl_priv *priv, ...@@ -266,7 +266,7 @@ static inline void _iwl_write_direct32(struct iwl_priv *priv,
{ {
_iwl_write32(priv, reg, value); _iwl_write32(priv, reg, value);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static void __iwl_write_direct32(u32 line, static void __iwl_write_direct32(u32 line,
struct iwl_priv *priv, u32 reg, u32 value) struct iwl_priv *priv, u32 reg, u32 value)
{ {
...@@ -306,7 +306,7 @@ static inline int _iwl_poll_direct_bit(struct iwl_priv *priv, ...@@ -306,7 +306,7 @@ static inline int _iwl_poll_direct_bit(struct iwl_priv *priv,
return -ETIMEDOUT; return -ETIMEDOUT;
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline int __iwl_poll_direct_bit(const char *f, u32 l, static inline int __iwl_poll_direct_bit(const char *f, u32 l,
struct iwl_priv *priv, struct iwl_priv *priv,
u32 addr, u32 mask, int timeout) u32 addr, u32 mask, int timeout)
...@@ -332,7 +332,7 @@ static inline u32 _iwl_read_prph(struct iwl_priv *priv, u32 reg) ...@@ -332,7 +332,7 @@ static inline u32 _iwl_read_prph(struct iwl_priv *priv, u32 reg)
_iwl_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24)); _iwl_write_direct32(priv, HBUS_TARG_PRPH_RADDR, reg | (3 << 24));
return _iwl_read_direct32(priv, HBUS_TARG_PRPH_RDAT); return _iwl_read_direct32(priv, HBUS_TARG_PRPH_RDAT);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline u32 __iwl_read_prph(u32 line, struct iwl_priv *priv, u32 reg) static inline u32 __iwl_read_prph(u32 line, struct iwl_priv *priv, u32 reg)
{ {
if (!atomic_read(&priv->restrict_refcnt)) if (!atomic_read(&priv->restrict_refcnt))
...@@ -353,7 +353,7 @@ static inline void _iwl_write_prph(struct iwl_priv *priv, ...@@ -353,7 +353,7 @@ static inline void _iwl_write_prph(struct iwl_priv *priv,
((addr & 0x0000FFFF) | (3 << 24))); ((addr & 0x0000FFFF) | (3 << 24)));
_iwl_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val); _iwl_write_direct32(priv, HBUS_TARG_PRPH_WDAT, val);
} }
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv, static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv,
u32 addr, u32 val) u32 addr, u32 val)
{ {
...@@ -370,7 +370,7 @@ static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv, ...@@ -370,7 +370,7 @@ static inline void __iwl_write_prph(u32 line, struct iwl_priv *priv,
#define _iwl_set_bits_prph(priv, reg, mask) \ #define _iwl_set_bits_prph(priv, reg, mask) \
_iwl_write_prph(priv, reg, (_iwl_read_prph(priv, reg) | mask)) _iwl_write_prph(priv, reg, (_iwl_read_prph(priv, reg) | mask))
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv, static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv,
u32 reg, u32 mask) u32 reg, u32 mask)
{ {
...@@ -388,7 +388,7 @@ static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv, ...@@ -388,7 +388,7 @@ static inline void __iwl_set_bits_prph(u32 line, struct iwl_priv *priv,
#define _iwl_set_bits_mask_prph(priv, reg, bits, mask) \ #define _iwl_set_bits_mask_prph(priv, reg, bits, mask) \
_iwl_write_prph(priv, reg, ((_iwl_read_prph(priv, reg) & mask) | bits)) _iwl_write_prph(priv, reg, ((_iwl_read_prph(priv, reg) & mask) | bits))
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
static inline void __iwl_set_bits_mask_prph(u32 line, static inline void __iwl_set_bits_mask_prph(u32 line,
struct iwl_priv *priv, u32 reg, u32 bits, u32 mask) struct iwl_priv *priv, u32 reg, u32 bits, u32 mask)
{ {
......
drivers/net/wireless/iwlwifi/iwl-4965-rs.c
View file @ c8b0e6e1
...@@ -197,7 +197,7 @@ static inline u8 iwl_rate_get_rate(u32 rate_n_flags) ...@@ -197,7 +197,7 @@ static inline u8 iwl_rate_get_rate(u32 rate_n_flags)
static int rs_send_lq_cmd(struct iwl_priv *priv, static int rs_send_lq_cmd(struct iwl_priv *priv,
struct iwl_link_quality_cmd *lq, u8 flags) struct iwl_link_quality_cmd *lq, u8 flags)
{ {
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
int i; int i;
#endif #endif
struct iwl_host_cmd cmd = { struct iwl_host_cmd cmd = {
...@@ -218,7 +218,7 @@ static int rs_send_lq_cmd(struct iwl_priv *priv, ...@@ -218,7 +218,7 @@ static int rs_send_lq_cmd(struct iwl_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_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_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);
...@@ -442,13 +442,13 @@ static inline void rs_toggle_antenna(struct iwl_rate *new_rate, ...@@ -442,13 +442,13 @@ static inline void rs_toggle_antenna(struct iwl_rate *new_rate,
static inline u8 rs_use_green(struct iwl_priv *priv) static inline u8 rs_use_green(struct iwl_priv *priv)
{ {
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
if (!priv->is_ht_enabled || !priv->current_assoc_ht.is_ht) if (!priv->is_ht_enabled || !priv->current_assoc_ht.is_ht)
return 0; return 0;
return ((priv->current_assoc_ht.is_green_field) && return ((priv->current_assoc_ht.is_green_field) &&
!(priv->current_assoc_ht.operating_mode & 0x4)); !(priv->current_assoc_ht.operating_mode & 0x4));
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL4965_HT */
return 0; return 0;
} }
...@@ -826,7 +826,7 @@ static void rs_get_expected_tpt_table(struct iwl_rate_scale_priv *lq_data, ...@@ -826,7 +826,7 @@ static void rs_get_expected_tpt_table(struct iwl_rate_scale_priv *lq_data,
tbl->expected_tpt = expected_tpt_G; tbl->expected_tpt = expected_tpt_G;
} }
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
static s32 rs_get_best_rate(struct iwl_priv *priv, static s32 rs_get_best_rate(struct iwl_priv *priv,
struct iwl_rate_scale_priv *lq_data, struct iwl_rate_scale_priv *lq_data,
struct iwl_scale_tbl_info *tbl, struct iwl_scale_tbl_info *tbl,
...@@ -879,7 +879,7 @@ static s32 rs_get_best_rate(struct iwl_priv *priv, ...@@ -879,7 +879,7 @@ static s32 rs_get_best_rate(struct iwl_priv *priv,
return new_rate; return new_rate;
} }
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
static inline u8 rs_is_both_ant_supp(u8 valid_antenna) static inline u8 rs_is_both_ant_supp(u8 valid_antenna)
{ {
...@@ -890,7 +890,7 @@ static int rs_switch_to_mimo(struct iwl_priv *priv, ...@@ -890,7 +890,7 @@ static int rs_switch_to_mimo(struct iwl_priv *priv,
struct iwl_rate_scale_priv *lq_data, struct iwl_rate_scale_priv *lq_data,
struct iwl_scale_tbl_info *tbl, int index) struct iwl_scale_tbl_info *tbl, int index)
{ {
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
u16 rate_mask; u16 rate_mask;
s32 rate; s32 rate;
s8 is_green = lq_data->is_green; s8 is_green = lq_data->is_green;
...@@ -938,7 +938,7 @@ static int rs_switch_to_mimo(struct iwl_priv *priv, ...@@ -938,7 +938,7 @@ static int rs_switch_to_mimo(struct iwl_priv *priv,
IWL_DEBUG_HT("LQ: Switch to new mcs %X index is green %X\n", IWL_DEBUG_HT("LQ: Switch to new mcs %X index is green %X\n",
tbl->current_rate.rate_n_flags, is_green); tbl->current_rate.rate_n_flags, is_green);
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL4965_HT */
return 0; return 0;
} }
...@@ -946,7 +946,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv, ...@@ -946,7 +946,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv,
struct iwl_rate_scale_priv *lq_data, struct iwl_rate_scale_priv *lq_data,
struct iwl_scale_tbl_info *tbl, int index) struct iwl_scale_tbl_info *tbl, int index)
{ {
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
u16 rate_mask; u16 rate_mask;
u8 is_green = lq_data->is_green; u8 is_green = lq_data->is_green;
s32 rate; s32 rate;
...@@ -992,7 +992,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv, ...@@ -992,7 +992,7 @@ static int rs_switch_to_siso(struct iwl_priv *priv,
IWL_DEBUG_HT("LQ: Switch to new mcs %X index is green %X\n", IWL_DEBUG_HT("LQ: Switch to new mcs %X index is green %X\n",
tbl->current_rate.rate_n_flags, is_green); tbl->current_rate.rate_n_flags, is_green);
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL4965_HT */
return 0; return 0;
} }
...@@ -1568,7 +1568,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, ...@@ -1568,7 +1568,7 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,
tbl1 = &(lq_data->lq_info[lq_data->active_tbl]); tbl1 = &(lq_data->lq_info[lq_data->active_tbl]);
if (is_legacy(tbl1->lq_type) && if (is_legacy(tbl1->lq_type) &&
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
!priv->current_assoc_ht.is_ht && !priv->current_assoc_ht.is_ht &&
#endif #endif
(lq_data->action_counter >= 1)) { (lq_data->action_counter >= 1)) {
...@@ -1579,14 +1579,14 @@ static void rs_rate_scale_perform(struct iwl_priv *priv, ...@@ -1579,14 +1579,14 @@ static void rs_rate_scale_perform(struct iwl_priv *priv,
if (lq_data->enable_counter && if (lq_data->enable_counter &&
(lq_data->action_counter >= IWL_ACTION_LIMIT)) { (lq_data->action_counter >= IWL_ACTION_LIMIT)) {
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
if ((lq_data->last_tpt > TID_AGG_TPT_THREHOLD) && if ((lq_data->last_tpt > TID_AGG_TPT_THREHOLD) &&
(priv->lq_mngr.agg_ctrl.auto_agg)) { (priv->lq_mngr.agg_ctrl.auto_agg)) {
priv->lq_mngr.agg_ctrl.tid_retry = priv->lq_mngr.agg_ctrl.tid_retry =
TID_ALL_SPECIFIED; TID_ALL_SPECIFIED;
schedule_work(&priv->agg_work); schedule_work(&priv->agg_work);
} }
#endif /*CONFIG_IWLWIFI_HT_AGG */ #endif /*CONFIG_IWL4965_HT_AGG */
lq_data->action_counter = 0; lq_data->action_counter = 0;
rs_set_stay_in_table(0, lq_data); rs_set_stay_in_table(0, lq_data);
} }
...@@ -1806,7 +1806,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, ...@@ -1806,7 +1806,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
crl->active_rate &= ~(0x1000); crl->active_rate &= ~(0x1000);
crl->active_rate_basic = priv->active_rate_basic; crl->active_rate_basic = priv->active_rate_basic;
crl->phymode = priv->phymode; crl->phymode = priv->phymode;
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
crl->active_siso_rate = (priv->current_assoc_ht.supp_rates[0] << 1); crl->active_siso_rate = (priv->current_assoc_ht.supp_rates[0] << 1);
crl->active_siso_rate |= (priv->current_assoc_ht.supp_rates[0] & 0x1); crl->active_siso_rate |= (priv->current_assoc_ht.supp_rates[0] & 0x1);
crl->active_siso_rate &= ~((u16)0x2); crl->active_siso_rate &= ~((u16)0x2);
...@@ -1818,7 +1818,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta, ...@@ -1818,7 +1818,7 @@ static void rs_rate_init(void *priv_rate, void *priv_sta,
crl->active_mimo_rate = crl->active_mimo_rate << IWL_FIRST_OFDM_RATE; crl->active_mimo_rate = crl->active_mimo_rate << IWL_FIRST_OFDM_RATE;
IWL_DEBUG_HT("MIMO RATE 0x%X SISO MASK 0x%X\n", crl->active_siso_rate, IWL_DEBUG_HT("MIMO RATE 0x%X SISO MASK 0x%X\n", crl->active_siso_rate,
crl->active_mimo_rate); crl->active_mimo_rate);
#endif /*CONFIG_IWLWIFI_HT*/ #endif /*CONFIG_IWL4965_HT*/
#ifdef CONFIG_MAC80211_DEBUGFS #ifdef CONFIG_MAC80211_DEBUGFS
crl->drv = priv; crl->drv = priv;
#endif #endif
...@@ -1937,12 +1937,12 @@ static void rs_clear(void *priv_rate) ...@@ -1937,12 +1937,12 @@ static void rs_clear(void *priv_rate)
IWL_DEBUG_RATE("enter\n"); IWL_DEBUG_RATE("enter\n");
priv->lq_mngr.lq_ready = 0; priv->lq_mngr.lq_ready = 0;
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
if (priv->lq_mngr.agg_ctrl.granted_ba) if (priv->lq_mngr.agg_ctrl.granted_ba)
iwl4965_turn_off_agg(priv, TID_ALL_SPECIFIED); iwl4965_turn_off_agg(priv, TID_ALL_SPECIFIED);
#endif /*CONFIG_IWLWIFI_HT_AGG */ #endif /*CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
IWL_DEBUG_RATE("leave\n"); IWL_DEBUG_RATE("leave\n");
} }
......
drivers/net/wireless/iwlwifi/iwl-4965.c
View file @ c8b0e6e1
...@@ -86,14 +86,14 @@ static int is_fat_channel(__le32 rxon_flags) ...@@ -86,14 +86,14 @@ static int is_fat_channel(__le32 rxon_flags)
static u8 is_single_stream(struct iwl_priv *priv) static u8 is_single_stream(struct iwl_priv *priv)
{ {
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
if (!priv->is_ht_enabled || !priv->current_assoc_ht.is_ht || if (!priv->is_ht_enabled || !priv->current_assoc_ht.is_ht ||
(priv->active_rate_ht[1] == 0) || (priv->active_rate_ht[1] == 0) ||
(priv->ps_mode == IWL_MIMO_PS_STATIC)) (priv->ps_mode == IWL_MIMO_PS_STATIC))
return 1; return 1;
#else #else
return 1; return 1;
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL4965_HT */
return 0; return 0;
} }
...@@ -743,7 +743,7 @@ void iwl4965_rf_kill_ct_config(struct iwl_priv *priv) ...@@ -743,7 +743,7 @@ void iwl4965_rf_kill_ct_config(struct iwl_priv *priv)
IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded\n"); IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded\n");
} }
#ifdef CONFIG_IWLWIFI_SENSITIVITY #ifdef CONFIG_IWL4965_SENSITIVITY
/* "false alarms" are signals that our DSP tries to lock onto, /* "false alarms" are signals that our DSP tries to lock onto,
* but then determines that they are either noise, or transmissions * but then determines that they are either noise, or transmissions
...@@ -1546,7 +1546,7 @@ static void iwl4965_bg_sensitivity_work(struct work_struct *work) ...@@ -1546,7 +1546,7 @@ static void iwl4965_bg_sensitivity_work(struct work_struct *work)
mutex_unlock(&priv->mutex); mutex_unlock(&priv->mutex);
return; return;
} }
#endif /*CONFIG_IWLWIFI_SENSITIVITY*/ #endif /*CONFIG_IWL4965_SENSITIVITY*/
static void iwl4965_bg_txpower_work(struct work_struct *work) static void iwl4965_bg_txpower_work(struct work_struct *work)
{ {
...@@ -1638,7 +1638,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv) ...@@ -1638,7 +1638,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv)
spin_lock_irqsave(&priv->lock, flags); spin_lock_irqsave(&priv->lock, flags);
#ifdef CONFIG_IWLWIFI_SENSITIVITY #ifdef CONFIG_IWL4965_SENSITIVITY
memset(&(priv->sensitivity_data), 0, memset(&(priv->sensitivity_data), 0,
sizeof(struct iwl_sensitivity_data)); sizeof(struct iwl_sensitivity_data));
memset(&(priv->chain_noise_data), 0, memset(&(priv->chain_noise_data), 0,
...@@ -1646,7 +1646,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv) ...@@ -1646,7 +1646,7 @@ int iwl4965_alive_notify(struct iwl_priv *priv)
for (i = 0; i < NUM_RX_CHAINS; i++) for (i = 0; i < NUM_RX_CHAINS; i++)
priv->chain_noise_data.delta_gain_code[i] = priv->chain_noise_data.delta_gain_code[i] =
CHAIN_NOISE_DELTA_GAIN_INIT_VAL; CHAIN_NOISE_DELTA_GAIN_INIT_VAL;
#endif /* CONFIG_IWLWIFI_SENSITIVITY*/ #endif /* CONFIG_IWL4965_SENSITIVITY*/
rc = iwl_grab_nic_access(priv); rc = iwl_grab_nic_access(priv);
if (rc) { if (rc) {
spin_unlock_irqrestore(&priv->lock, flags); spin_unlock_irqrestore(&priv->lock, flags);
...@@ -2814,8 +2814,8 @@ void iwl4965_set_rxon_chain(struct iwl_priv *priv) ...@@ -2814,8 +2814,8 @@ void iwl4965_set_rxon_chain(struct iwl_priv *priv)
IWL_DEBUG_ASSOC("rx chain %X\n", priv->staging_rxon.rx_chain); IWL_DEBUG_ASSOC("rx chain %X\n", priv->staging_rxon.rx_chain);
} }
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
/* /*
get the traffic load value for tid get the traffic load value for tid
*/ */
...@@ -3149,8 +3149,8 @@ static void iwl4965_bg_agg_work(struct work_struct *work) ...@@ -3149,8 +3149,8 @@ static void iwl4965_bg_agg_work(struct work_struct *work)
spin_unlock_irqrestore(&priv->lq_mngr.lock, flags); spin_unlock_irqrestore(&priv->lq_mngr.lock, flags);
return; return;
} }
#endif /*CONFIG_IWLWIFI_HT_AGG */ #endif /*CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd, int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd,
u8 sta_id, dma_addr_t txcmd_phys, u8 sta_id, dma_addr_t txcmd_phys,
...@@ -3165,11 +3165,11 @@ int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd, ...@@ -3165,11 +3165,11 @@ int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd,
u16 fc; u16 fc;
u16 rate_flags; u16 rate_flags;
int rate_index = min(ctrl->tx_rate & 0xffff, IWL_RATE_COUNT - 1); int rate_index = min(ctrl->tx_rate & 0xffff, IWL_RATE_COUNT - 1);
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
__le16 *qc; __le16 *qc;
#endif /*CONFIG_IWLWIFI_HT_AGG */ #endif /*CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
unicast = !is_multicast_ether_addr(hdr->addr1); unicast = !is_multicast_ether_addr(hdr->addr1);
...@@ -3230,8 +3230,8 @@ int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd, ...@@ -3230,8 +3230,8 @@ int iwl4965_tx_cmd(struct iwl_priv *priv, struct iwl_cmd *out_cmd,
if (ieee80211_is_back_request(fc)) if (ieee80211_is_back_request(fc))
tx->tx_flags |= TX_CMD_FLG_ACK_MSK | tx->tx_flags |= TX_CMD_FLG_ACK_MSK |
TX_CMD_FLG_IMM_BA_RSP_MASK; TX_CMD_FLG_IMM_BA_RSP_MASK;
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
qc = ieee80211_get_qos_ctrl(hdr); qc = ieee80211_get_qos_ctrl(hdr);
if (qc && if (qc &&
(priv->iw_mode != IEEE80211_IF_TYPE_IBSS)) { (priv->iw_mode != IEEE80211_IF_TYPE_IBSS)) {
...@@ -3443,7 +3443,7 @@ void iwl_hw_rx_statistics(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) ...@@ -3443,7 +3443,7 @@ void iwl_hw_rx_statistics(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)) && if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)) &&
(pkt->hdr.cmd == STATISTICS_NOTIFICATION)) { (pkt->hdr.cmd == STATISTICS_NOTIFICATION)) {
iwl4965_rx_calc_noise(priv); iwl4965_rx_calc_noise(priv);
#ifdef CONFIG_IWLWIFI_SENSITIVITY #ifdef CONFIG_IWL4965_SENSITIVITY
queue_work(priv->workqueue, &priv->sensitivity_work); queue_work(priv->workqueue, &priv->sensitivity_work);
#endif #endif
} }
...@@ -3596,7 +3596,7 @@ static int iwl4965_calc_rssi(struct iwl4965_rx_phy_res *rx_resp) ...@@ -3596,7 +3596,7 @@ static int iwl4965_calc_rssi(struct iwl4965_rx_phy_res *rx_resp)
return (max_rssi - agc - IWL_RSSI_OFFSET); return (max_rssi - agc - IWL_RSSI_OFFSET);
} }
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
/* Parsed Information Elements */ /* Parsed Information Elements */
struct ieee802_11_elems { struct ieee802_11_elems {
...@@ -3668,7 +3668,7 @@ static int parse_elems(u8 *start, size_t len, struct ieee802_11_elems *elems) ...@@ -3668,7 +3668,7 @@ static int parse_elems(u8 *start, size_t len, struct ieee802_11_elems *elems)
return 0; return 0;
} }
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
static void iwl4965_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id) static void iwl4965_sta_modify_ps_wake(struct iwl_priv *priv, int sta_id)
{ {
...@@ -3728,9 +3728,9 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, ...@@ -3728,9 +3728,9 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
.antenna = 0, .antenna = 0,
.rate = iwl_hw_get_rate(rx_start->rate_n_flags), .rate = iwl_hw_get_rate(rx_start->rate_n_flags),
.flag = 0, .flag = 0,
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
.ordered = 0 .ordered = 0
#endif /* CONFIG_IWLWIFI_HT_AGG */ #endif /* CONFIG_IWL4965_HT_AGG */
}; };
u8 network_packet; u8 network_packet;
...@@ -3802,7 +3802,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, ...@@ -3802,7 +3802,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
if (!iwl_is_associated(priv)) if (!iwl_is_associated(priv))
priv->last_rx_noise = IWL_NOISE_MEAS_NOT_AVAILABLE; priv->last_rx_noise = IWL_NOISE_MEAS_NOT_AVAILABLE;
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
/* TODO: Parts of iwl_report_frame are broken for 4965 */ /* TODO: Parts of iwl_report_frame are broken for 4965 */
if (iwl_debug_level & (IWL_DL_RX)) if (iwl_debug_level & (IWL_DL_RX))
/* Set "1" to report good data frames in groups of 100 */ /* Set "1" to report good data frames in groups of 100 */
...@@ -3866,10 +3866,10 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, ...@@ -3866,10 +3866,10 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
case IEEE80211_STYPE_ASSOC_RESP: case IEEE80211_STYPE_ASSOC_RESP:
case IEEE80211_STYPE_REASSOC_RESP: case IEEE80211_STYPE_REASSOC_RESP:
if (network_packet) { if (network_packet) {
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
u8 *pos = NULL; u8 *pos = NULL;
struct ieee802_11_elems elems; struct ieee802_11_elems elems;
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL4965_HT */
struct ieee80211_mgmt *mgnt = struct ieee80211_mgmt *mgnt =
(struct ieee80211_mgmt *)header; (struct ieee80211_mgmt *)header;
...@@ -3878,7 +3878,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, ...@@ -3878,7 +3878,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
priv->assoc_capability = priv->assoc_capability =
le16_to_cpu( le16_to_cpu(
mgnt->u.assoc_resp.capab_info); mgnt->u.assoc_resp.capab_info);
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
pos = mgnt->u.assoc_resp.variable; pos = mgnt->u.assoc_resp.variable;
if (!parse_elems(pos, if (!parse_elems(pos,
len - (pos - (u8 *) mgnt), len - (pos - (u8 *) mgnt),
...@@ -3887,7 +3887,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, ...@@ -3887,7 +3887,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
elems.ht_cap_param) elems.ht_cap_param)
break; break;
} }
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL4965_HT */
/* assoc_id is 0 no association */ /* assoc_id is 0 no association */
if (!priv->assoc_id) if (!priv->assoc_id)
break; break;
...@@ -3919,7 +3919,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv, ...@@ -3919,7 +3919,7 @@ static void iwl4965_rx_reply_rx(struct iwl_priv *priv,
break; break;
case IEEE80211_FTYPE_CTL: case IEEE80211_FTYPE_CTL:
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
switch (fc & IEEE80211_FCTL_STYPE) { switch (fc & IEEE80211_FCTL_STYPE) {
case IEEE80211_STYPE_BACK_REQ: case IEEE80211_STYPE_BACK_REQ:
IWL_DEBUG_HT("IEEE80211_STYPE_BACK_REQ arrived\n"); IWL_DEBUG_HT("IEEE80211_STYPE_BACK_REQ arrived\n");
...@@ -3979,7 +3979,7 @@ static void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv, ...@@ -3979,7 +3979,7 @@ static void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv,
struct iwl_rx_mem_buffer *rxb) struct iwl_rx_mem_buffer *rxb)
{ {
#ifdef CONFIG_IWLWIFI_SENSITIVITY #ifdef CONFIG_IWL4965_SENSITIVITY
struct iwl_rx_packet *pkt = (void *)rxb->skb->data; struct iwl_rx_packet *pkt = (void *)rxb->skb->data;
struct iwl_missed_beacon_notif *missed_beacon; struct iwl_missed_beacon_notif *missed_beacon;
...@@ -3994,11 +3994,11 @@ static void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv, ...@@ -3994,11 +3994,11 @@ static void iwl4965_rx_missed_beacon_notif(struct iwl_priv *priv,
if (unlikely(!test_bit(STATUS_SCANNING, &priv->status))) if (unlikely(!test_bit(STATUS_SCANNING, &priv->status)))
queue_work(priv->workqueue, &priv->sensitivity_work); queue_work(priv->workqueue, &priv->sensitivity_work);
} }
#endif /*CONFIG_IWLWIFI_SENSITIVITY*/ #endif /*CONFIG_IWL4965_SENSITIVITY*/
} }
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
static void iwl4965_set_tx_status(struct iwl_priv *priv, int txq_id, int idx, static void iwl4965_set_tx_status(struct iwl_priv *priv, int txq_id, int idx,
u32 status, u32 retry_count, u32 rate) u32 status, u32 retry_count, u32 rate)
...@@ -4267,8 +4267,8 @@ static int iwl4965_tx_queue_agg_disable(struct iwl_priv *priv, u16 txq_id, ...@@ -4267,8 +4267,8 @@ static int iwl4965_tx_queue_agg_disable(struct iwl_priv *priv, u16 txq_id,
return 0; return 0;
} }
#endif/* CONFIG_IWLWIFI_HT_AGG */ #endif/* CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
/* /*
* RATE SCALE CODE * RATE SCALE CODE
*/ */
...@@ -4331,7 +4331,7 @@ void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap) ...@@ -4331,7 +4331,7 @@ void iwl4965_add_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
&link_cmd); &link_cmd);
} }
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
static u8 iwl_is_channel_extension(struct iwl_priv *priv, int phymode, static u8 iwl_is_channel_extension(struct iwl_priv *priv, int phymode,
u16 channel, u8 extension_chan_offset) u16 channel, u8 extension_chan_offset)
...@@ -4468,7 +4468,7 @@ void iwl4965_set_ht_add_station(struct iwl_priv *priv, u8 index) ...@@ -4468,7 +4468,7 @@ void iwl4965_set_ht_add_station(struct iwl_priv *priv, u8 index)
return; return;
} }
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
static void iwl4965_sta_modify_add_ba_tid(struct iwl_priv *priv, static void iwl4965_sta_modify_add_ba_tid(struct iwl_priv *priv,
int sta_id, int tid, u16 ssn) int sta_id, int tid, u16 ssn)
...@@ -4642,8 +4642,8 @@ int iwl_mac_ht_rx_agg_stop(struct ieee80211_hw *hw, u8 *da, ...@@ -4642,8 +4642,8 @@ int iwl_mac_ht_rx_agg_stop(struct ieee80211_hw *hw, u8 *da,
return 0; return 0;
} }
#endif /* CONFIG_IWLWIFI_HT_AGG */ #endif /* CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
/* Set up 4965-specific Rx frame reply handlers */ /* Set up 4965-specific Rx frame reply handlers */
void iwl_hw_rx_handler_setup(struct iwl_priv *priv) void iwl_hw_rx_handler_setup(struct iwl_priv *priv)
...@@ -4658,25 +4658,25 @@ void iwl_hw_rx_handler_setup(struct iwl_priv *priv) ...@@ -4658,25 +4658,25 @@ void iwl_hw_rx_handler_setup(struct iwl_priv *priv)
priv->rx_handlers[MISSED_BEACONS_NOTIFICATION] = priv->rx_handlers[MISSED_BEACONS_NOTIFICATION] =
iwl4965_rx_missed_beacon_notif; iwl4965_rx_missed_beacon_notif;
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
priv->rx_handlers[REPLY_COMPRESSED_BA] = iwl4965_rx_reply_compressed_ba; priv->rx_handlers[REPLY_COMPRESSED_BA] = iwl4965_rx_reply_compressed_ba;
#endif /* CONFIG_IWLWIFI_AGG */ #endif /* CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWLWIFI */ #endif /* CONFIG_IWL4965_HT */
} }
void iwl_hw_setup_deferred_work(struct iwl_priv *priv) void iwl_hw_setup_deferred_work(struct iwl_priv *priv)
{ {
INIT_WORK(&priv->txpower_work, iwl4965_bg_txpower_work); INIT_WORK(&priv->txpower_work, iwl4965_bg_txpower_work);
INIT_WORK(&priv->statistics_work, iwl4965_bg_statistics_work); INIT_WORK(&priv->statistics_work, iwl4965_bg_statistics_work);
#ifdef CONFIG_IWLWIFI_SENSITIVITY #ifdef CONFIG_IWL4965_SENSITIVITY
INIT_WORK(&priv->sensitivity_work, iwl4965_bg_sensitivity_work); INIT_WORK(&priv->sensitivity_work, iwl4965_bg_sensitivity_work);
#endif #endif
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
INIT_WORK(&priv->agg_work, iwl4965_bg_agg_work); INIT_WORK(&priv->agg_work, iwl4965_bg_agg_work);
#endif /* CONFIG_IWLWIFI_AGG */ #endif /* CONFIG_IWL4965_AGG */
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
init_timer(&priv->statistics_periodic); init_timer(&priv->statistics_periodic);
priv->statistics_periodic.data = (unsigned long)priv; priv->statistics_periodic.data = (unsigned long)priv;
priv->statistics_periodic.function = iwl4965_bg_statistics_periodic; priv->statistics_periodic.function = iwl4965_bg_statistics_periodic;
......
drivers/net/wireless/iwlwifi/iwl-4965.h
View file @ c8b0e6e1
...@@ -434,8 +434,8 @@ struct iwl_rx_queue { ...@@ -434,8 +434,8 @@ struct iwl_rx_queue {
#define IWL_INVALID_RATE 0xFF #define IWL_INVALID_RATE 0xFF
#define IWL_INVALID_VALUE -1 #define IWL_INVALID_VALUE -1
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
struct iwl_ht_agg { struct iwl_ht_agg {
u16 txq_id; u16 txq_id;
u16 frame_count; u16 frame_count;
...@@ -445,16 +445,16 @@ struct iwl_ht_agg { ...@@ -445,16 +445,16 @@ struct iwl_ht_agg {
u32 bitmap1; u32 bitmap1;
u32 rate_n_flags; u32 rate_n_flags;
}; };
#endif /* CONFIG_IWLWIFI_HT_AGG */ #endif /* CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
struct iwl_tid_data { struct iwl_tid_data {
u16 seq_number; u16 seq_number;
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
struct iwl_ht_agg agg; struct iwl_ht_agg agg;
#endif /* CONFIG_IWLWIFI_HT_AGG */ #endif /* CONFIG_IWL4965_HT_AGG */
#endif /* CONFIG_IWLWIFI_HT */ #endif /* CONFIG_IWL4965_HT */
}; };
struct iwl_hw_key { struct iwl_hw_key {
...@@ -471,7 +471,7 @@ union iwl_ht_rate_supp { ...@@ -471,7 +471,7 @@ union iwl_ht_rate_supp {
}; };
}; };
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#define CFG_HT_RX_AMPDU_FACTOR_DEF (0x3) #define CFG_HT_RX_AMPDU_FACTOR_DEF (0x3)
#define HT_IE_MAX_AMSDU_SIZE_4K (0) #define HT_IE_MAX_AMSDU_SIZE_4K (0)
#define CFG_HT_MPDU_DENSITY_2USEC (0x5) #define CFG_HT_MPDU_DENSITY_2USEC (0x5)
...@@ -494,9 +494,9 @@ struct sta_ht_info { ...@@ -494,9 +494,9 @@ struct sta_ht_info {
u8 tx_chan_width; u8 tx_chan_width;
u8 chan_width_cap; u8 chan_width_cap;
}; };
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL4965_HT */
#ifdef CONFIG_IWLWIFI_QOS #ifdef CONFIG_IWL4965_QOS
union iwl_qos_capabity { union iwl_qos_capabity {
struct { struct {
...@@ -525,7 +525,7 @@ struct iwl_qos_info { ...@@ -525,7 +525,7 @@ struct iwl_qos_info {
union iwl_qos_capabity qos_cap; union iwl_qos_capabity qos_cap;
struct iwl_qosparam_cmd def_qos_parm; struct iwl_qosparam_cmd def_qos_parm;
}; };
#endif /*CONFIG_IWLWIFI_QOS */ #endif /*CONFIG_IWL4965_QOS */
#define STA_PS_STATUS_WAKE 0 #define STA_PS_STATUS_WAKE 0
#define STA_PS_STATUS_SLEEP 1 #define STA_PS_STATUS_SLEEP 1
...@@ -617,7 +617,7 @@ extern int iwl_is_network_packet(struct iwl_priv *priv, ...@@ -617,7 +617,7 @@ extern int iwl_is_network_packet(struct iwl_priv *priv,
struct ieee80211_hdr *header); struct ieee80211_hdr *header);
extern int iwl_power_init_handle(struct iwl_priv *priv); extern int iwl_power_init_handle(struct iwl_priv *priv);
extern int iwl_eeprom_init(struct iwl_priv *priv); extern int iwl_eeprom_init(struct iwl_priv *priv);
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
extern void iwl_report_frame(struct iwl_priv *priv, extern void iwl_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);
...@@ -764,8 +764,8 @@ extern int iwl4965_set_fat_chan_info(struct iwl_priv *priv, int phymode, ...@@ -764,8 +764,8 @@ extern int iwl4965_set_fat_chan_info(struct iwl_priv *priv, int phymode,
u8 fat_extension_channel); u8 fat_extension_channel);
extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv); extern void iwl4965_rf_kill_ct_config(struct iwl_priv *priv);
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
extern int iwl_mac_ht_tx_agg_start(struct ieee80211_hw *hw, u8 *da, extern int iwl_mac_ht_tx_agg_start(struct ieee80211_hw *hw, u8 *da,
u16 tid, u16 *start_seq_num); u16 tid, u16 *start_seq_num);
extern int iwl_mac_ht_rx_agg_start(struct ieee80211_hw *hw, u8 *da, extern int iwl_mac_ht_rx_agg_start(struct ieee80211_hw *hw, u8 *da,
...@@ -775,8 +775,8 @@ extern int iwl_mac_ht_rx_agg_stop(struct ieee80211_hw *hw, u8 *da, ...@@ -775,8 +775,8 @@ extern int iwl_mac_ht_rx_agg_stop(struct ieee80211_hw *hw, u8 *da,
extern int iwl_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da, extern int iwl_mac_ht_tx_agg_stop(struct ieee80211_hw *hw, u8 *da,
u16 tid, int generator); u16 tid, int generator);
extern void iwl4965_turn_off_agg(struct iwl_priv *priv, u8 tid); extern void iwl4965_turn_off_agg(struct iwl_priv *priv, u8 tid);
#endif /* CONFIG_IWLWIFI_HT_AGG */ #endif /* CONFIG_IWL4965_HT_AGG */
#endif /*CONFIG_IWLWIFI_HT */ #endif /*CONFIG_IWL4965_HT */
/* Structures, enum, and defines specific to the 4965 */ /* Structures, enum, and defines specific to the 4965 */
#define IWL4965_KW_SIZE 0x1000 /*4k */ #define IWL4965_KW_SIZE 0x1000 /*4k */
...@@ -843,7 +843,7 @@ struct iwl_traffic_load { ...@@ -843,7 +843,7 @@ struct iwl_traffic_load {
u32 total; u32 total;
}; };
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
struct iwl_agg_control { struct iwl_agg_control {
unsigned long next_retry; unsigned long next_retry;
u32 wait_for_agg_status; u32 wait_for_agg_status;
...@@ -855,10 +855,10 @@ struct iwl_agg_control { ...@@ -855,10 +855,10 @@ struct iwl_agg_control {
u32 ba_timeout; u32 ba_timeout;
struct iwl_traffic_load traffic_load[TID_MAX_LOAD_COUNT]; struct iwl_traffic_load traffic_load[TID_MAX_LOAD_COUNT];
}; };
#endif /*CONFIG_IWLWIFI_HT_AGG */ #endif /*CONFIG_IWL4965_HT_AGG */
struct iwl_lq_mngr { struct iwl_lq_mngr {
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
struct iwl_agg_control agg_ctrl; struct iwl_agg_control agg_ctrl;
#endif #endif
spinlock_t lock; spinlock_t lock;
...@@ -1040,7 +1040,7 @@ struct iwl_chain_noise_data { ...@@ -1040,7 +1040,7 @@ struct iwl_chain_noise_data {
#define EEPROM_SEM_RETRY_LIMIT 1000 #define EEPROM_SEM_RETRY_LIMIT 1000
#ifdef CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT #ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT
enum { enum {
MEASUREMENT_READY = (1 << 0), MEASUREMENT_READY = (1 << 0),
...@@ -1068,7 +1068,7 @@ struct iwl_priv { ...@@ -1068,7 +1068,7 @@ struct iwl_priv {
const struct ieee80211_hw_mode *modes; const struct ieee80211_hw_mode *modes;
#ifdef CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT #ifdef CONFIG_IWL4965_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;
...@@ -1157,14 +1157,14 @@ struct iwl_priv { ...@@ -1157,14 +1157,14 @@ struct iwl_priv {
u8 channel_width; /* 0=20MHZ, 1=40MHZ */ u8 channel_width; /* 0=20MHZ, 1=40MHZ */
u8 current_channel_width; u8 current_channel_width;
u8 valid_antenna; /* Bit mask of antennas actually connected */ u8 valid_antenna; /* Bit mask of antennas actually connected */
#ifdef CONFIG_IWLWIFI_SENSITIVITY #ifdef CONFIG_IWL4965_SENSITIVITY
struct iwl_sensitivity_data sensitivity_data; struct iwl_sensitivity_data sensitivity_data;
struct iwl_chain_noise_data chain_noise_data; struct iwl_chain_noise_data chain_noise_data;
u8 start_calib; u8 start_calib;
__le16 sensitivity_tbl[HD_TABLE_SIZE]; __le16 sensitivity_tbl[HD_TABLE_SIZE];
#endif /*CONFIG_IWLWIFI_SENSITIVITY*/ #endif /*CONFIG_IWL4965_SENSITIVITY*/
#ifdef CONFIG_IWLWIFI_HT #ifdef CONFIG_IWL4965_HT
struct sta_ht_info current_assoc_ht; struct sta_ht_info current_assoc_ht;
#endif #endif
u8 active_rate_ht[2]; u8 active_rate_ht[2];
...@@ -1253,9 +1253,9 @@ struct iwl_priv { ...@@ -1253,9 +1253,9 @@ struct iwl_priv {
u16 assoc_capability; u16 assoc_capability;
u8 ps_mode; u8 ps_mode;
#ifdef CONFIG_IWLWIFI_QOS #ifdef CONFIG_IWL4965_QOS
struct iwl_qos_info qos_data; struct iwl_qos_info qos_data;
#endif /*CONFIG_IWLWIFI_QOS */ #endif /*CONFIG_IWL4965_QOS */
struct workqueue_struct *workqueue; struct workqueue_struct *workqueue;
...@@ -1290,20 +1290,20 @@ struct iwl_priv { ...@@ -1290,20 +1290,20 @@ struct iwl_priv {
u32 pm_state[16]; u32 pm_state[16];
#endif #endif
#ifdef CONFIG_IWLWIFI_DEBUG #ifdef CONFIG_IWL4965_DEBUG
/* debugging info */ /* debugging info */
u32 framecnt_to_us; u32 framecnt_to_us;
atomic_t restrict_refcnt; atomic_t restrict_refcnt;
#endif #endif
struct work_struct txpower_work; struct work_struct txpower_work;
#ifdef CONFIG_IWLWIFI_SENSITIVITY #ifdef CONFIG_IWL4965_SENSITIVITY
struct work_struct sensitivity_work; struct work_struct sensitivity_work;
#endif #endif
struct work_struct statistics_work; struct work_struct statistics_work;
struct timer_list statistics_periodic; struct timer_list statistics_periodic;
#ifdef CONFIG_IWLWIFI_HT_AGG #ifdef CONFIG_IWL4965_HT_AGG
struct work_struct agg_work; struct work_struct agg_work;
#endif #endif
}; /*iwl_priv */ }; /*iwl_priv */
......
drivers/net/wireless/iwlwifi/iwl3945-base.c
View file @ c8b0e6e1
This diff is collapsed.
drivers/net/wireless/iwlwifi/iwl4965-base.c
View file @ c8b0e6e1
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7