diff options
author | Don Fry <donald.h.fry@intel.com> | 2011-09-30 14:40:20 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-10-03 15:22:38 -0400 |
commit | 3c607d27c818cf4a5d28f2c73b18a88f8fbdfa33 (patch) | |
tree | 562c4a404f830c53f3ea332579213feeda80e10e | |
parent | 28d8c1df03502918bcafed38a0ccdca090b3a38b (diff) |
iwlagn: rename iwlagn module iwlwifi and alias to iwlagn.
Rename the iwlagn module as iwlwifi in preparation for future
changes. Add an alias to iwlagn for backward compatibility.
Signed-off-by: Don Fry <donald.h.fry@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 5 | ||||
-rw-r--r-- | drivers/net/wireless/Makefile | 2 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/Kconfig | 22 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/Makefile | 40 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-agn.c | 1 | ||||
-rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-shared.h | 2 |
6 files changed, 39 insertions, 33 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index dfd6a9f4a583..1cf3dbdb1538 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -555,3 +555,8 @@ Why: This driver has been superseded by g_mass_storage. | |||
555 | Who: Alan Stern <stern@rowland.harvard.edu> | 555 | Who: Alan Stern <stern@rowland.harvard.edu> |
556 | 556 | ||
557 | ---------------------------- | 557 | ---------------------------- |
558 | What: iwlagn alias support | ||
559 | When: 3.5 | ||
560 | Why: The iwlagn module has been renamed iwlwifi. The alias will be around | ||
561 | for backward compatibility for several cycles and then dropped. | ||
562 | Who: Don Fry <donald.h.fry@intel.com> \ No newline at end of file | ||
diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile index 7bba6a82b875..4cf0ad312da1 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile | |||
@@ -41,7 +41,7 @@ obj-$(CONFIG_ADM8211) += adm8211.o | |||
41 | 41 | ||
42 | obj-$(CONFIG_MWL8K) += mwl8k.o | 42 | obj-$(CONFIG_MWL8K) += mwl8k.o |
43 | 43 | ||
44 | obj-$(CONFIG_IWLAGN) += iwlwifi/ | 44 | obj-$(CONFIG_IWLWIFI) += iwlwifi/ |
45 | obj-$(CONFIG_IWLWIFI_LEGACY) += iwlegacy/ | 45 | obj-$(CONFIG_IWLWIFI_LEGACY) += iwlegacy/ |
46 | obj-$(CONFIG_RT2X00) += rt2x00/ | 46 | obj-$(CONFIG_RT2X00) += rt2x00/ |
47 | 47 | ||
diff --git a/drivers/net/wireless/iwlwifi/Kconfig b/drivers/net/wireless/iwlwifi/Kconfig index 1d7572f9887f..e0441033788c 100644 --- a/drivers/net/wireless/iwlwifi/Kconfig +++ b/drivers/net/wireless/iwlwifi/Kconfig | |||
@@ -1,5 +1,5 @@ | |||
1 | config IWLAGN | 1 | config IWLWIFI |
2 | tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlagn) " | 2 | tristate "Intel Wireless WiFi Next Gen AGN - Wireless-N/Advanced-N/Ultimate-N (iwlwifi) " |
3 | depends on PCI && MAC80211 | 3 | depends on PCI && MAC80211 |
4 | select FW_LOADER | 4 | select FW_LOADER |
5 | select NEW_LEDS | 5 | select NEW_LEDS |
@@ -39,14 +39,14 @@ config IWLAGN | |||
39 | If you want to compile the driver as a module ( = code which can be | 39 | If you want to compile the driver as a module ( = code which can be |
40 | inserted in and removed from the running kernel whenever you want), | 40 | inserted in and removed from the running kernel whenever you want), |
41 | say M here and read <file:Documentation/kbuild/modules.txt>. The | 41 | say M here and read <file:Documentation/kbuild/modules.txt>. The |
42 | module will be called iwlagn. | 42 | module will be called iwlwifi. |
43 | 43 | ||
44 | menu "Debugging Options" | 44 | menu "Debugging Options" |
45 | depends on IWLAGN | 45 | depends on IWLWIFI |
46 | 46 | ||
47 | config IWLWIFI_DEBUG | 47 | config IWLWIFI_DEBUG |
48 | bool "Enable full debugging output in the iwlagn driver" | 48 | bool "Enable full debugging output in the iwlwifi driver" |
49 | depends on IWLAGN | 49 | depends on IWLWIFI |
50 | ---help--- | 50 | ---help--- |
51 | This option will enable debug tracing output for the iwlwifi drivers | 51 | This option will enable debug tracing output for the iwlwifi drivers |
52 | 52 | ||
@@ -70,8 +70,8 @@ config IWLWIFI_DEBUG | |||
70 | any problems you may encounter. | 70 | any problems you may encounter. |
71 | 71 | ||
72 | config IWLWIFI_DEBUGFS | 72 | config IWLWIFI_DEBUGFS |
73 | bool "iwlagn debugfs support" | 73 | bool "iwlwifi debugfs support" |
74 | depends on IWLAGN && MAC80211_DEBUGFS | 74 | depends on IWLWIFI && MAC80211_DEBUGFS |
75 | ---help--- | 75 | ---help--- |
76 | Enable creation of debugfs files for the iwlwifi drivers. This | 76 | Enable creation of debugfs files for the iwlwifi drivers. This |
77 | is a low-impact option that allows getting insight into the | 77 | is a low-impact option that allows getting insight into the |
@@ -79,13 +79,13 @@ config IWLWIFI_DEBUGFS | |||
79 | 79 | ||
80 | config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE | 80 | config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE |
81 | bool "Experimental uCode support" | 81 | bool "Experimental uCode support" |
82 | depends on IWLAGN && IWLWIFI_DEBUG | 82 | depends on IWLWIFI && IWLWIFI_DEBUG |
83 | ---help--- | 83 | ---help--- |
84 | Enable use of experimental ucode for testing and debugging. | 84 | Enable use of experimental ucode for testing and debugging. |
85 | 85 | ||
86 | config IWLWIFI_DEVICE_TRACING | 86 | config IWLWIFI_DEVICE_TRACING |
87 | bool "iwlwifi device access tracing" | 87 | bool "iwlwifi device access tracing" |
88 | depends on IWLAGN | 88 | depends on IWLWIFI |
89 | depends on EVENT_TRACING | 89 | depends on EVENT_TRACING |
90 | help | 90 | help |
91 | Say Y here to trace all commands, including TX frames and IO | 91 | Say Y here to trace all commands, including TX frames and IO |
@@ -104,7 +104,7 @@ endmenu | |||
104 | 104 | ||
105 | config IWLWIFI_DEVICE_SVTOOL | 105 | config IWLWIFI_DEVICE_SVTOOL |
106 | bool "iwlwifi device svtool support" | 106 | bool "iwlwifi device svtool support" |
107 | depends on IWLAGN | 107 | depends on IWLWIFI |
108 | select NL80211_TESTMODE | 108 | select NL80211_TESTMODE |
109 | help | 109 | help |
110 | This option enables the svtool support for iwlwifi device through | 110 | This option enables the svtool support for iwlwifi device through |
diff --git a/drivers/net/wireless/iwlwifi/Makefile b/drivers/net/wireless/iwlwifi/Makefile index 8fa59cdb3b49..bacafa4a5f48 100644 --- a/drivers/net/wireless/iwlwifi/Makefile +++ b/drivers/net/wireless/iwlwifi/Makefile | |||
@@ -1,25 +1,25 @@ | |||
1 | # AGN | 1 | # WIFI |
2 | obj-$(CONFIG_IWLAGN) += iwlagn.o | 2 | obj-$(CONFIG_IWLWIFI) += iwlwifi.o |
3 | iwlagn-objs := iwl-agn.o iwl-agn-rs.o | 3 | iwlwifi-objs := iwl-agn.o iwl-agn-rs.o |
4 | iwlagn-objs += iwl-agn-ucode.o iwl-agn-tx.o | 4 | iwlwifi-objs += iwl-agn-ucode.o iwl-agn-tx.o |
5 | iwlagn-objs += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o | 5 | iwlwifi-objs += iwl-agn-lib.o iwl-agn-calib.o iwl-io.o |
6 | iwlagn-objs += iwl-agn-tt.o iwl-agn-sta.o | 6 | iwlwifi-objs += iwl-agn-tt.o iwl-agn-sta.o |
7 | 7 | ||
8 | iwlagn-objs += iwl-core.o iwl-eeprom.o iwl-power.o | 8 | iwlwifi-objs += iwl-core.o iwl-eeprom.o iwl-power.o |
9 | iwlagn-objs += iwl-rx.o iwl-sta.o | 9 | iwlwifi-objs += iwl-rx.o iwl-sta.o |
10 | iwlagn-objs += iwl-scan.o iwl-led.o | 10 | iwlwifi-objs += iwl-scan.o iwl-led.o |
11 | iwlagn-objs += iwl-agn-rxon.o | 11 | iwlwifi-objs += iwl-agn-rxon.o |
12 | iwlagn-objs += iwl-5000.o | 12 | iwlwifi-objs += iwl-5000.o |
13 | iwlagn-objs += iwl-6000.o | 13 | iwlwifi-objs += iwl-6000.o |
14 | iwlagn-objs += iwl-1000.o | 14 | iwlwifi-objs += iwl-1000.o |
15 | iwlagn-objs += iwl-2000.o | 15 | iwlwifi-objs += iwl-2000.o |
16 | iwlagn-objs += iwl-pci.o | 16 | iwlwifi-objs += iwl-pci.o |
17 | iwlagn-objs += iwl-trans.o | 17 | iwlwifi-objs += iwl-trans.o |
18 | iwlagn-objs += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o | 18 | iwlwifi-objs += iwl-trans-pcie.o iwl-trans-pcie-rx.o iwl-trans-pcie-tx.o |
19 | 19 | ||
20 | iwlagn-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o | 20 | iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += iwl-debugfs.o |
21 | iwlagn-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o | 21 | iwlwifi-$(CONFIG_IWLWIFI_DEVICE_TRACING) += iwl-devtrace.o |
22 | iwlagn-$(CONFIG_IWLWIFI_DEVICE_SVTOOL) += iwl-sv-open.o | 22 | iwlwifi-$(CONFIG_IWLWIFI_DEVICE_SVTOOL) += iwl-sv-open.o |
23 | 23 | ||
24 | CFLAGS_iwl-devtrace.o := -I$(src) | 24 | CFLAGS_iwl-devtrace.o := -I$(src) |
25 | 25 | ||
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c index baaf48616cc7..d0fd6f063bf8 100644 --- a/drivers/net/wireless/iwlwifi/iwl-agn.c +++ b/drivers/net/wireless/iwlwifi/iwl-agn.c | |||
@@ -79,6 +79,7 @@ MODULE_DESCRIPTION(DRV_DESCRIPTION); | |||
79 | MODULE_VERSION(DRV_VERSION); | 79 | MODULE_VERSION(DRV_VERSION); |
80 | MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); | 80 | MODULE_AUTHOR(DRV_COPYRIGHT " " DRV_AUTHOR); |
81 | MODULE_LICENSE("GPL"); | 81 | MODULE_LICENSE("GPL"); |
82 | MODULE_ALIAS("iwlagn"); | ||
82 | 83 | ||
83 | void iwl_update_chain_flags(struct iwl_priv *priv) | 84 | void iwl_update_chain_flags(struct iwl_priv *priv) |
84 | { | 85 | { |
diff --git a/drivers/net/wireless/iwlwifi/iwl-shared.h b/drivers/net/wireless/iwlwifi/iwl-shared.h index 8747bbdf8983..3a24b477b8fb 100644 --- a/drivers/net/wireless/iwlwifi/iwl-shared.h +++ b/drivers/net/wireless/iwlwifi/iwl-shared.h | |||
@@ -100,7 +100,7 @@ struct iwl_priv; | |||
100 | struct iwl_sensitivity_ranges; | 100 | struct iwl_sensitivity_ranges; |
101 | struct iwl_trans_ops; | 101 | struct iwl_trans_ops; |
102 | 102 | ||
103 | #define DRV_NAME "iwlagn" | 103 | #define DRV_NAME "iwlwifi" |
104 | #define IWLWIFI_VERSION "in-tree:" | 104 | #define IWLWIFI_VERSION "in-tree:" |
105 | #define DRV_COPYRIGHT "Copyright(c) 2003-2011 Intel Corporation" | 105 | #define DRV_COPYRIGHT "Copyright(c) 2003-2011 Intel Corporation" |
106 | #define DRV_AUTHOR "<ilw@linux.intel.com>" | 106 | #define DRV_AUTHOR "<ilw@linux.intel.com>" |