mac80211: rename files

This patch renames all mac80211 files (except ieee80211_i.h) to get rid
of the useless ieee80211_ prefix.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index 8559f252a55f09ff5e59be8a562917148871d362..85c22641542d6a8ed93226e2a3ee9b6c3f4e4b2c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -37,7 +37,7 @@
 
 #include <linux/workqueue.h>
 
-#include "../net/mac80211/ieee80211_rate.h"
+#include "../net/mac80211/rate.h"
 
 #include "iwl-3945.h"
 

diff --git a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
index 32eb414899d667f9cd9571651f6789c43975adeb..315b0433801eae7e3963e2a0e3b2c074305437fd 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-4965-rs.c
@@ -36,7 +36,7 @@
 
 #include <linux/workqueue.h>
 
-#include "../net/mac80211/ieee80211_rate.h"
+#include "../net/mac80211/rate.h"
 
 #include "iwl-4965.h"
 #include "iwl-core.h"

diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile
index 70f4b26c2d872d6859a87ce0f044d571259612ee..4e5847fd316c9870180720e815d7284793194526 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -10,14 +10,14 @@ rc-pid-m := rc80211_pid.o
 
 # mac80211 objects
 mac80211-y := \
-       ieee80211.o \
-       ieee80211_ioctl.o \
+       main.o \
+       wext.o \
        sta_info.o \
        wep.o \
        wpa.o \
-       ieee80211_sta.o \
-       ieee80211_iface.o \
-       ieee80211_rate.o \
+       mlme.o \
+       iface.o \
+       rate.o \
        michael.o \
        tkip.o \
        aes_ccm.o \
@@ -28,7 +28,7 @@ mac80211-y := \
        util.o \
        event.o
 
-mac80211-$(CONFIG_MAC80211_LEDS) += ieee80211_led.o
+mac80211-$(CONFIG_MAC80211_LEDS) += led.o
 mac80211-$(CONFIG_NET_SCHED) += wme.o
 mac80211-$(CONFIG_MAC80211_DEBUGFS) += \
        debugfs.o \

diff --git a/net/mac80211/aes_ccm.c b/net/mac80211/aes_ccm.c
index e62fe55944b88774233059b247038be252d5844a..59f1691f62c89abcfef52f4b2bbc3156cb4c1062 100644 (file)
--- a/net/mac80211/aes_ccm.c
+++ b/net/mac80211/aes_ccm.c
@@ -13,7 +13,7 @@
 #include <linux/err.h>
 
 #include <net/mac80211.h>
-#include "ieee80211_key.h"
+#include "key.h"
 #include "aes_ccm.h"
 
 

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index fe05a7b85dc62a0b4867773b399a5bf41ee7ae86..8af576c1d2f135f07d2db86c9edca749a9549e94 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -14,7 +14,7 @@
 #include <net/cfg80211.h>
 #include "ieee80211_i.h"
 #include "cfg.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "mesh.h"
 
 static enum ieee80211_if_types

diff --git a/net/mac80211/debugfs.c b/net/mac80211/debugfs.c
index f4bb08b62d1a009ed8bb6dd113203694bff1e078..1cccbfd781f67e651dd72ff0423a2eaaae616eda 100644 (file)
--- a/net/mac80211/debugfs.c
+++ b/net/mac80211/debugfs.c
@@ -10,7 +10,7 @@
 #include <linux/debugfs.h>
 #include <linux/rtnetlink.h>
 #include "ieee80211_i.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "debugfs.h"
 
 int mac80211_open_file_generic(struct inode *inode, struct file *file)

diff --git a/net/mac80211/debugfs_key.c b/net/mac80211/debugfs_key.c
index 459f0767fae53e70b5e53076f21712057e6abb2a..bf7027e9ce9fbc2aaa3ab79023064e8cef3537c7 100644 (file)
--- a/net/mac80211/debugfs_key.c
+++ b/net/mac80211/debugfs_key.c
@@ -10,7 +10,7 @@
 
 #include <linux/kobject.h>
 #include "ieee80211_i.h"
-#include "ieee80211_key.h"
+#include "key.h"
 #include "debugfs.h"
 #include "debugfs_key.h"
 

diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c
index 55cd6fc3f2e0ccb007168f0e37ec27696da0e022..e3326d046944129d0b8f872591b27006cfb3f95f 100644 (file)
--- a/net/mac80211/debugfs_netdev.c
+++ b/net/mac80211/debugfs_netdev.c
@@ -17,7 +17,7 @@
 #include <net/mac80211.h>
 #include <net/cfg80211.h>
 #include "ieee80211_i.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "debugfs.h"
 #include "debugfs_netdev.h"
 

diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h
index 7f4e7f93ee47a0714f35b2f7a668d00a94c25af6..c642538e8282c88c5676d56e8c83a7b515bca5b1 100644 (file)
--- a/net/mac80211/ieee80211_i.h
+++ b/net/mac80211/ieee80211_i.h
@@ -23,7 +23,7 @@
 #include <linux/spinlock.h>
 #include <linux/etherdevice.h>
 #include <net/wireless.h>
-#include "ieee80211_key.h"
+#include "key.h"
 #include "sta_info.h"
 
 /* ieee80211.o internal definitions, etc. These are not included into

diff --git a/net/mac80211/ieee80211_iface.c b/net/mac80211/iface.c
similarity index 100%
rename from net/mac80211/ieee80211_iface.c
rename to net/mac80211/iface.c

diff --git a/net/mac80211/ieee80211_key.h b/net/mac80211/key.h
similarity index 100%
rename from net/mac80211/ieee80211_key.h
rename to net/mac80211/key.h

diff --git a/net/mac80211/ieee80211_led.c b/net/mac80211/led.c
similarity index 99%
rename from net/mac80211/ieee80211_led.c
rename to net/mac80211/led.c
index f401484ab6d7d1502ba79051e79d3af9f2d32369..162a643f16b69b92d039c9216d9147c0194ca735 100644 (file)
--- a/net/mac80211/ieee80211_led.c
+++ b/net/mac80211/led.c
@@ -8,7 +8,7 @@
 
 /* just for IFNAMSIZ */
 #include <linux/if.h>
-#include "ieee80211_led.h"
+#include "led.h"
 
 void ieee80211_led_rx(struct ieee80211_local *local)
 {

diff --git a/net/mac80211/ieee80211_led.h b/net/mac80211/led.h
similarity index 100%
rename from net/mac80211/ieee80211_led.h
rename to net/mac80211/led.h

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/main.c
similarity index 99%
rename from net/mac80211/ieee80211.c
rename to net/mac80211/main.c
index dbe993af8034cbf545943213ada78ffb9782cb77..bfcbcf5353ad815a1b14cc641ccfeea830e3a145 100644 (file)
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/main.c
@@ -25,12 +25,12 @@
 #include <net/cfg80211.h>
 
 #include "ieee80211_i.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "mesh.h"
 #include "wep.h"
 #include "wme.h"
 #include "aes_ccm.h"
-#include "ieee80211_led.h"
+#include "led.h"
 #include "cfg.h"
 #include "debugfs.h"
 #include "debugfs_netdev.h"

diff --git a/net/mac80211/mesh_plink.c b/net/mac80211/mesh_plink.c
index 67271baa5b616b9c2fae8c1dbd373e8d7ffc9053..37f0c2b94ae7a7524b28dff277fc8fc2c98b5b5b 100644 (file)
--- a/net/mac80211/mesh_plink.c
+++ b/net/mac80211/mesh_plink.c
@@ -9,7 +9,7 @@
 #include <linux/kernel.h>
 #include <linux/random.h>
 #include "ieee80211_i.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "mesh.h"
 
 #ifdef CONFIG_MAC80211_VERBOSE_MPL_DEBUG

diff --git a/net/mac80211/ieee80211_sta.c b/net/mac80211/mlme.c
similarity index 99%
rename from net/mac80211/ieee80211_sta.c
rename to net/mac80211/mlme.c
index 3584a2bf0186cf75521ab96ed3c86a188a697c4a..bdaab1391d4e904cf74ebcc0372529b1460de3a2 100644 (file)
--- a/net/mac80211/ieee80211_sta.c
+++ b/net/mac80211/mlme.c
@@ -30,8 +30,8 @@
 
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "ieee80211_rate.h"
-#include "ieee80211_led.h"
+#include "rate.h"
+#include "led.h"
 #include "mesh.h"
 
 #define IEEE80211_AUTH_TIMEOUT (HZ / 5)

diff --git a/net/mac80211/ieee80211_rate.c b/net/mac80211/rate.c
similarity index 99%
rename from net/mac80211/ieee80211_rate.c
rename to net/mac80211/rate.c
index 4de06f128d9017102981da7bc4298ed69d63233f..841df93807fc86fa0178cf282f4d9ce11b1c7317 100644 (file)
--- a/net/mac80211/ieee80211_rate.c
+++ b/net/mac80211/rate.c
@@ -10,7 +10,7 @@
 
 #include <linux/kernel.h>
 #include <linux/rtnetlink.h>
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "ieee80211_i.h"
 
 struct rate_control_alg {

diff --git a/net/mac80211/ieee80211_rate.h b/net/mac80211/rate.h
similarity index 100%
rename from net/mac80211/ieee80211_rate.h
rename to net/mac80211/rate.h

diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c
index a1993161de997f2fff0ddab7a4a862afad2b8651..a849b745bdb56b6f83b19a98e73f069f42341621 100644 (file)
--- a/net/mac80211/rc80211_pid_algo.c
+++ b/net/mac80211/rc80211_pid_algo.c
@@ -14,7 +14,7 @@
 #include <linux/skbuff.h>
 #include <linux/debugfs.h>
 #include <net/mac80211.h>
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "mesh.h"
 #include "rc80211_pid.h"
 

diff --git a/net/mac80211/rc80211_pid_debugfs.c b/net/mac80211/rc80211_pid_debugfs.c
index 88b8dc9999bbdb34546a8e1365ff86979858c678..ae75d417873988c3b9edcaff38d83b8d97af2153 100644 (file)
--- a/net/mac80211/rc80211_pid_debugfs.c
+++ b/net/mac80211/rc80211_pid_debugfs.c
@@ -13,7 +13,7 @@
 #include <linux/skbuff.h>
 
 #include <net/mac80211.h>
-#include "ieee80211_rate.h"
+#include "rate.h"
 
 #include "rc80211_pid.h"
 

diff --git a/net/mac80211/rx.c b/net/mac80211/rx.c
index 0ac6db5c09eab1e20faa5a56f313e776ceaa7a0b..306eadb01fc4121a96598c3d0b0d11a24727879e 100644 (file)
--- a/net/mac80211/rx.c
+++ b/net/mac80211/rx.c
@@ -19,7 +19,7 @@
 #include <net/ieee80211_radiotap.h>
 
 #include "ieee80211_i.h"
-#include "ieee80211_led.h"
+#include "led.h"
 #include "mesh.h"
 #include "wep.h"
 #include "wpa.h"

diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c
index 5540cbf7c44548de3ecaeaf0f9262fe9af3dc86f..7d4fe4a52929292a685ef3cfaebfb3a07097754b 100644 (file)
--- a/net/mac80211/sta_info.c
+++ b/net/mac80211/sta_info.c
@@ -19,7 +19,7 @@
 
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "sta_info.h"
 #include "debugfs_sta.h"
 #include "mesh.h"

diff --git a/net/mac80211/sta_info.h b/net/mac80211/sta_info.h
index 30fd328e9991f60641e7f469d10453fd69172f80..f8c95bc9659cae3065c0a58b0757dde9b4695dcc 100644 (file)
--- a/net/mac80211/sta_info.h
+++ b/net/mac80211/sta_info.h
@@ -12,7 +12,7 @@
 #include <linux/list.h>
 #include <linux/types.h>
 #include <linux/if_ether.h>
-#include "ieee80211_key.h"
+#include "key.h"
 
 /**
  * enum ieee80211_sta_info_flags - Stations flags

diff --git a/net/mac80211/tkip.c b/net/mac80211/tkip.c
index 45d59f19c29f2b4585d7e79ade403f09441b6ee4..dddbfd60f35148e790a46d80db2ae70821f7850e 100644 (file)
--- a/net/mac80211/tkip.c
+++ b/net/mac80211/tkip.c
@@ -12,7 +12,7 @@
 #include <linux/netdevice.h>
 
 #include <net/mac80211.h>
-#include "ieee80211_key.h"
+#include "key.h"
 #include "tkip.h"
 #include "wep.h"
 

diff --git a/net/mac80211/tkip.h b/net/mac80211/tkip.h
index ffaee3253e1923e7c017df1a4f938a1392f669f1..b7c2ee763d9d5d03562c3e73ad8710ff46480e00 100644 (file)
--- a/net/mac80211/tkip.h
+++ b/net/mac80211/tkip.h
@@ -11,7 +11,7 @@
 
 #include <linux/types.h>
 #include <linux/crypto.h>
-#include "ieee80211_key.h"
+#include "key.h"
 
 u8 * ieee80211_tkip_add_iv(u8 *pos, struct ieee80211_key *key,
                           u8 iv0, u8 iv1, u8 iv2);

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index ea3fa0f919066c176a3e34cb6bcb02ced5792ec6..f35eaea98e7316bcac44b45adb0d210ca3ad551e 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -25,12 +25,12 @@
 #include <asm/unaligned.h>
 
 #include "ieee80211_i.h"
-#include "ieee80211_led.h"
+#include "led.h"
 #include "mesh.h"
 #include "wep.h"
 #include "wpa.h"
 #include "wme.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 
 #define IEEE80211_TX_OK                0
 #define IEEE80211_TX_AGAIN     1

diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index 57c404f3f6d0c76a7dfce985d2e0736a6f820327..cc9f715c7bfc5bce2a8caf90248bddd64b1f07f7 100644 (file)
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -25,7 +25,7 @@
 #include <net/rtnetlink.h>
 
 #include "ieee80211_i.h"
-#include "ieee80211_rate.h"
+#include "rate.h"
 #include "mesh.h"
 #include "wme.h"
 

diff --git a/net/mac80211/wep.h b/net/mac80211/wep.h
index 9f723938b63f553a5836129b7b780ca9c732b4cb..363779c5065897ef39b72532e0d467424f0e6b17 100644 (file)
--- a/net/mac80211/wep.h
+++ b/net/mac80211/wep.h
@@ -14,7 +14,7 @@
 #include <linux/skbuff.h>
 #include <linux/types.h>
 #include "ieee80211_i.h"
-#include "ieee80211_key.h"
+#include "key.h"
 
 int ieee80211_wep_init(struct ieee80211_local *local);
 void ieee80211_wep_free(struct ieee80211_local *local);

diff --git a/net/mac80211/ieee80211_ioctl.c b/net/mac80211/wext.c
similarity index 99%
rename from net/mac80211/ieee80211_ioctl.c
rename to net/mac80211/wext.c
index a611c8bc76bd408ef8b00875644621767d979330..69aed16faff311482a4767d928f0e3a168945045 100644 (file)
--- a/net/mac80211/ieee80211_ioctl.c
+++ b/net/mac80211/wext.c
@@ -21,8 +21,8 @@
 
 #include <net/mac80211.h>
 #include "ieee80211_i.h"
-#include "ieee80211_led.h"
-#include "ieee80211_rate.h"
+#include "led.h"
+#include "rate.h"
 #include "wpa.h"
 #include "aes_ccm.h"