Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4fc22b21 authored by Tomas Winkler's avatar Tomas Winkler Committed by John W. Linville
Browse files

iwlwifi: rename 4965 to AGN 



This patch renames driver name from 4965 to AGN
The driver supports both 4965AGN and 5000AGN family

The driver's original module name iwl4965.ko remains as an alias

Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 3ac7f146

drivers/net/wireless/iwlwifi/Kconfig

+51 −47
Original line number Diff line number Diff line
@@ -14,18 +14,49 @@ config IWLWIFI_LEDS 
	default n



config IWLWIFI_RFKILL

	boolean "IWLWIFI RF kill support"

	boolean "Iwlwifi RF kill support"

	depends on IWLCORE



config IWL4965

	tristate "Intel Wireless WiFi 4965AGN"

config IWLWIFI_DEBUG

	bool "Enable full debugging output in iwlagn driver"

	depends on IWLCORE

	---help---

	  This option will enable debug tracing output for the iwlwifi drivers



	  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/class/net/wlan0/device/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/class/net/wlan0/device/debug_level



	  You can find the list of debug mask values in:

		  drivers/net/wireless/iwlwifi/iwl-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.



config IWLWIFI_DEBUGFS

        bool "Iwlwifi debugfs support"

        depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS

        ---help---

	  Enable creation of debugfs files for the iwlwifi drivers.



config IWLAGN

	tristate "Intel Wireless WiFi Next Gen AGN"

	depends on PCI && MAC80211 && WLAN_80211 && EXPERIMENTAL

	select FW_LOADER

	select IWLCORE

	---help---

	  Select to build the driver supporting the:



	  Intel Wireless WiFi Link 4965AGN

	  Intel Wireless WiFi Link Next-Gen AGN



	  This driver uses the kernel's mac80211 subsystem.
@@ -42,60 +73,33 @@ config IWL4965 
	  If you want to compile the driver as a module ( = code which can be

	  inserted in and removed from the running kernel whenever you want),

	  say M here and read <file:Documentation/kbuild/modules.txt>.  The

	  module will be called iwl4965.ko.



config IWL4965_LEDS

	bool "Enable LEDS features in iwl4965 driver"

	depends on IWL4965

	select IWLWIFI_LEDS

	---help---

	  This option enables LEDS for the iwlwifi drivers

	  module will be called iwlagn.ko.





config IWL4965_SPECTRUM_MEASUREMENT

	bool "Enable Spectrum Measurement in iwl4965 driver"

	depends on IWL4965

config IWLAGN_SPECTRUM_MEASUREMENT

	bool "Enable Spectrum Measurement in iwlagn driver"

	depends on IWLAGN

	---help---

	  This option will enable spectrum measurement for the iwl4965 driver.

	  This option will enable spectrum measurement for the iwlagn driver.



config IWLWIFI_DEBUG

	bool "Enable full debugging output in iwl4965 driver"

	depends on IWL4965

config IWLAGN_LEDS

	bool "Enable LEDS features in iwlagn driver"

	depends on IWLAGN

	select IWLWIFI_LEDS

	---help---

	  This option will enable debug tracing output for the iwl4965

	  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/class/net/wlan0/device/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/class/net/wlan0/device/debug_level

	  This option enables LEDS for the iwlagn drivers



	  You can find the list of debug mask values in:

		  drivers/net/wireless/iwlwifi/iwl-4965-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.

config IWL4965

	bool "Intel Wireless WiFi 4965AGN"

	depends on IWLAGN

	---help---

	  This option enables support for Intel Wireless WiFi Link 4965AGN



config IWL5000

	bool "Intel Wireless WiFi 5000AGN"

	depends on IWL4965

	depends on IWLAGN

	---help---

	  This option enables support for Intel Wireless WiFi Link 5000AGN Family

	  Dependency on 4965 is temporary



config IWLWIFI_DEBUGFS

        bool "Iwlwifi debugfs support"

        depends on IWLCORE && IWLWIFI_DEBUG && MAC80211_DEBUGFS

        ---help---

	  Enable creation of debugfs files for the iwlwifi drivers.



config IWL3945

	tristate "Intel PRO/Wireless 3945ABG/BG Network Connection"

drivers/net/wireless/iwlwifi/Makefile

+6 −5
Original line number Diff line number Diff line
@@ -6,13 +6,14 @@ iwlcore-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o 
iwlcore-$(CONFIG_IWLWIFI_LEDS) += iwl-led.o

iwlcore-$(CONFIG_IWLWIFI_RFKILL) += iwl-rfkill.o



obj-$(CONFIG_IWLAGN)	+= iwlagn.o

iwlagn-objs		:= iwl-agn.o iwl-agn-rs.o



iwlagn-$(CONFIG_IWL4965) += iwl-4965.o

iwlagn-$(CONFIG_IWL5000) += iwl-5000.o



obj-$(CONFIG_IWL3945)	+= iwl3945.o

iwl3945-objs		:= iwl3945-base.o iwl-3945.o iwl-3945-rs.o

iwl3945-$(CONFIG_IWL3945_LEDS) += iwl-3945-led.o



obj-$(CONFIG_IWL4965)	+= iwl4965.o

iwl4965-objs		:= iwl-agn.o iwl-4965.o iwl-agn-rs.o



iwl4965-$(CONFIG_IWL5000) += iwl-5000.o

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

+9 −6
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ 
#define VD

#endif



#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT

#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT

#define VS "s"

#else

#define VS
@@ -86,6 +86,7 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); 
MODULE_VERSION(DRV_VERSION);

MODULE_AUTHOR(DRV_COPYRIGHT);

MODULE_LICENSE("GPL");

MODULE_ALIAS("iwl4965");



/*************** STATION TABLE MANAGEMENT ****

 * mac80211 should be examined to determine if sta_info is duplicating
@@ -883,7 +884,7 @@ static void iwl4965_set_rate(struct iwl_priv *priv) 
		   (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;

}



#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT

#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT



#include "iwl-spectrum.h"
@@ -1087,7 +1088,7 @@ static void iwl4965_rx_csa(struct iwl_priv *priv, struct iwl_rx_mem_buffer *rxb) 
static void iwl4965_rx_spectrum_measure_notif(struct iwl_priv *priv,

					  struct iwl_rx_mem_buffer *rxb)

{

#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT

#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT

	struct iwl_rx_packet *pkt = (struct iwl_rx_packet *)rxb->skb->data;

	struct iwl4965_spectrum_notification *report = &(pkt->u.spectrum_notif);
@@ -3786,7 +3787,7 @@ static ssize_t store_filter_flags(struct device *d, 
static DEVICE_ATTR(filter_flags, S_IWUSR | S_IRUGO, show_filter_flags,

		   store_filter_flags);



#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT

#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT



static ssize_t show_measurement(struct device *d,

				struct device_attribute *attr, char *buf)
@@ -3857,7 +3858,7 @@ static ssize_t store_measurement(struct device *d, 


static DEVICE_ATTR(measurement, S_IRUSR | S_IWUSR,

		   show_measurement, store_measurement);

#endif /* CONFIG_IWL4965_SPECTRUM_MEASUREMENT */

#endif /* CONFIG_IWLAGN_SPECTRUM_MEASUREMENT */



static ssize_t store_retry_rate(struct device *d,

				struct device_attribute *attr,
@@ -4105,7 +4106,7 @@ static struct attribute *iwl4965_sysfs_entries[] = { 
	&dev_attr_channels.attr,

	&dev_attr_flags.attr,

	&dev_attr_filter_flags.attr,

#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT

#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT

	&dev_attr_measurement.attr,

#endif

	&dev_attr_power_level.attr,
@@ -4457,8 +4458,10 @@ static int iwl4965_pci_resume(struct pci_dev *pdev) 


/* Hardware specific file defines the PCI IDs table for that hardware module */

static struct pci_device_id iwl_hw_card_ids[] = {

#ifdef CONFIG_IWL4965

	{IWL_PCI_DEVICE(0x4229, PCI_ANY_ID, iwl4965_agn_cfg)},

	{IWL_PCI_DEVICE(0x4230, PCI_ANY_ID, iwl4965_agn_cfg)},

#endif /* CONFIG_IWL4965 */

#ifdef CONFIG_IWL5000

	{IWL_PCI_DEVICE(0x4232, 0x1205, iwl5100_bg_cfg)},

	{IWL_PCI_DEVICE(0x4232, 0x1305, iwl5100_bg_cfg)},

drivers/net/wireless/iwlwifi/iwl-dev.h

+2 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#include <linux/kernel.h>

#include <net/ieee80211_radiotap.h>



#define DRV_NAME        "iwl4965"

#define DRV_NAME        "iwlagn"

#include "iwl-rfkill.h"

#include "iwl-eeprom.h"

#include "iwl-4965-hw.h"
@@ -808,14 +808,11 @@ struct iwl_chain_noise_data { 
#define EEPROM_SEM_RETRY_LIMIT 1000	/* number of attempts (not time) */





#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT



enum {

	MEASUREMENT_READY = (1 << 0),

	MEASUREMENT_ACTIVE = (1 << 1),

};



#endif



#define IWL_MAX_NUM_QUEUES	20 /* FIXME: do dynamic allocation */
@@ -840,7 +837,7 @@ struct iwl_priv { 


	struct ieee80211_supported_band bands[IEEE80211_NUM_BANDS];



#ifdef CONFIG_IWL4965_SPECTRUM_MEASUREMENT

#ifdef CONFIG_IWLAGN_SPECTRUM_MEASUREMENT

	/* spectrum measurement report caching */

	struct iwl4965_spectrum_notification measure_report;

	u8 measurement_status;