aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-agn.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-agn.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-agn.c15
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 4ff0636dbdd..6503b3ac8d6 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -73,7 +73,7 @@
73#define VD 73#define VD
74#endif 74#endif
75 75
76#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT 76#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT
77#define VS "s" 77#define VS "s"
78#else 78#else
79#define VS 79#define VS
@@ -86,6 +86,7 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION);
86MODULE_VERSION(DRV_VERSION); 86MODULE_VERSION(DRV_VERSION);
87MODULE_AUTHOR(DRV_COPYRIGHT); 87MODULE_AUTHOR(DRV_COPYRIGHT);
88MODULE_LICENSE("GPL"); 88MODULE_LICENSE("GPL");
89MODULE_ALIAS("iwl4965");
89 90
90/*************** STATION TABLE MANAGEMENT **** 91/*************** STATION TABLE MANAGEMENT ****
91 * mac80211 should be examined to determine if sta_info is duplicating 92 * mac80211 should be examined to determine if sta_info is duplicating
@@ -883,7 +884,7 @@ static void iwl4965_set_rate(struct iwl_priv *priv)
883 (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF; 884 (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;
884} 885}
885 886
886#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT 887#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT
887 888
888#include "iwl-spectrum.h" 889#include "iwl-spectrum.h"
889 890
@@ -1087,7 +1088,7 @@ static void iwl4965_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb)
1087static void iwl4965_rx_spectrum_measure_notif(struct iwl_priv *priv, 1088static void iwl4965_rx_spectrum_measure_notif(struct iwl_priv *priv,
1088 struct iwl_rx_mem_buffer *rxb) 1089 struct iwl_rx_mem_buffer *rxb)
1089{ 1090{
1090#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT 1091#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT
1091 struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data; 1092 struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;
1092 struct iwl4965_spectrum_notification *report = &(pkt->u.spectrum_notif); 1093 struct iwl4965_spectrum_notification *report = &(pkt->u.spectrum_notif);
1093 1094
@@ -3786,7 +3787,7 @@ static ssize_t store_filter_flags(struct device *d,
3786static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags, 3787static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags,
3787 store_filter_flags); 3788 store_filter_flags);
3788 3789
3789#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT 3790#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT
3790 3791
3791static ssize_t show_measurement(struct device *d, 3792static ssize_t show_measurement(struct device *d,
3792 struct device_attribute *attr, char *buf) 3793 struct device_attribute *attr, char *buf)
@@ -3857,7 +3858,7 @@ static ssize_t store_measurement(struct device *d,
3857 3858
3858static DEVICE_ATTR(measurement, S_IRUSR | S_IWUSR, 3859static DEVICE_ATTR(measurement, S_IRUSR | S_IWUSR,
3859 show_measurement, store_measurement); 3860 show_measurement, store_measurement);
3860#endif /* CONFIG_IWL4965_SPECTRUM_MEASUREMENT */ 3861#endif /* CONFIG_IWLAGN_SPECTRUM_MEASUREMENT */
3861 3862
3862static ssize_t store_retry_rate(struct device *d, 3863static ssize_t store_retry_rate(struct device *d,
3863 struct device_attribute *attr, 3864 struct device_attribute *attr,
@@ -4105,7 +4106,7 @@ static struct attribute *iwl4965_sysfs_entries[] = {
4105 &dev_attr_channels.attr, 4106 &dev_attr_channels.attr,
4106 &dev_attr_flags.attr, 4107 &dev_attr_flags.attr,
4107 &dev_attr_filter_flags.attr, 4108 &dev_attr_filter_flags.attr,
4108#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT 4109#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT
4109 &dev_attr_measurement.attr, 4110 &dev_attr_measurement.attr,
4110#endif 4111#endif
4111 &dev_attr_power_level.attr, 4112 &dev_attr_power_level.attr,
@@ -4457,8 +4458,10 @@ static int iwl4965_pci_resume(struct pci_dev *pdev)
4457 4458
4458/* Hardware specific file defines the PCI IDs table for that hardware module */ 4459/* Hardware specific file defines the PCI IDs table for that hardware module */
4459static struct pci_device_id iwl_hw_card_ids[] = { 4460static struct pci_device_id iwl_hw_card_ids[] = {
4461#ifdef CONFIG_IWL4965
4460 {IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)}, 4462 {IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)},
4461 {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)}, 4463 {IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)},
4464#endif /* CONFIG_IWL4965 */
4462#ifdef CONFIG_IWL5000 4465#ifdef CONFIG_IWL5000
4463 {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bg_cfg)}, 4466 {IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bg_cfg)},
4464 {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bg_cfg)}, 4467 {IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bg_cfg)},