diff options
author | Johannes Berg | 2008-04-08 15:14:40 -0400 |
---|---|---|
committer | John W. Linville | 2008-04-08 16:44:45 -0400 |
commit | 2c8dccc77420fb7433da5674818959d3499d35be (patch) | |
tree | 2da037732b78a4796254b485f0c591d9625b7d1e /net/mac80211 | |
parent | 3b96766f0e643f52ae19e134664df6730c737e87 (diff) |
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>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/Makefile | 12 | ||||
-rw-r--r-- | net/mac80211/aes_ccm.c | 2 | ||||
-rw-r--r-- | net/mac80211/cfg.c | 2 | ||||
-rw-r--r-- | net/mac80211/debugfs.c | 2 | ||||
-rw-r--r-- | net/mac80211/debugfs_key.c | 2 | ||||
-rw-r--r-- | net/mac80211/debugfs_netdev.c | 2 | ||||
-rw-r--r-- | net/mac80211/ieee80211_i.h | 2 | ||||
-rw-r--r-- | net/mac80211/iface.c (renamed from net/mac80211/ieee80211_iface.c) | 0 | ||||
-rw-r--r-- | net/mac80211/key.h (renamed from net/mac80211/ieee80211_key.h) | 0 | ||||
-rw-r--r-- | net/mac80211/led.c (renamed from net/mac80211/ieee80211_led.c) | 2 | ||||
-rw-r--r-- | net/mac80211/led.h (renamed from net/mac80211/ieee80211_led.h) | 0 | ||||
-rw-r--r-- | net/mac80211/main.c (renamed from net/mac80211/ieee80211.c) | 4 | ||||
-rw-r--r-- | net/mac80211/mesh_plink.c | 2 | ||||
-rw-r--r-- | net/mac80211/mlme.c (renamed from net/mac80211/ieee80211_sta.c) | 4 | ||||
-rw-r--r-- | net/mac80211/rate.c (renamed from net/mac80211/ieee80211_rate.c) | 2 | ||||
-rw-r--r-- | net/mac80211/rate.h (renamed from net/mac80211/ieee80211_rate.h) | 0 | ||||
-rw-r--r-- | net/mac80211/rc80211_pid_algo.c | 2 | ||||
-rw-r--r-- | net/mac80211/rc80211_pid_debugfs.c | 2 | ||||
-rw-r--r-- | net/mac80211/rx.c | 2 | ||||
-rw-r--r-- | net/mac80211/sta_info.c | 2 | ||||
-rw-r--r-- | net/mac80211/sta_info.h | 2 | ||||
-rw-r--r-- | net/mac80211/tkip.c | 2 | ||||
-rw-r--r-- | net/mac80211/tkip.h | 2 | ||||
-rw-r--r-- | net/mac80211/tx.c | 4 | ||||
-rw-r--r-- | net/mac80211/util.c | 2 | ||||
-rw-r--r-- | net/mac80211/wep.h | 2 | ||||
-rw-r--r-- | net/mac80211/wext.c (renamed from net/mac80211/ieee80211_ioctl.c) | 4 |
27 files changed, 32 insertions, 32 deletions
diff --git a/net/mac80211/Makefile b/net/mac80211/Makefile index 70f4b26c2d87..4e5847fd316c 100644 --- 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 e62fe55944b8..59f1691f62c8 100644 --- 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 fe05a7b85dc6..8af576c1d2f1 100644 --- 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 f4bb08b62d1a..1cccbfd781f6 100644 --- 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 459f0767fae5..bf7027e9ce9f 100644 --- 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 55cd6fc3f2e0..e3326d046944 100644 --- 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 7f4e7f93ee47..c642538e8282 100644 --- 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 index 80954a512185..80954a512185 100644 --- a/net/mac80211/ieee80211_iface.c +++ b/net/mac80211/iface.c diff --git a/net/mac80211/ieee80211_key.h b/net/mac80211/key.h index 467890c6fe81..467890c6fe81 100644 --- a/net/mac80211/ieee80211_key.h +++ b/net/mac80211/key.h diff --git a/net/mac80211/ieee80211_led.c b/net/mac80211/led.c index f401484ab6d7..162a643f16b6 100644 --- 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 index 77b1e1ba6039..77b1e1ba6039 100644 --- a/net/mac80211/ieee80211_led.h +++ b/net/mac80211/led.h diff --git a/net/mac80211/ieee80211.c b/net/mac80211/main.c index dbe993af8034..bfcbcf5353ad 100644 --- 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 67271baa5b61..37f0c2b94ae7 100644 --- 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 index 3584a2bf0186..bdaab1391d4e 100644 --- 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 index 4de06f128d90..841df93807fc 100644 --- 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 index 5b45f33cb766..5b45f33cb766 100644 --- a/net/mac80211/ieee80211_rate.h +++ b/net/mac80211/rate.h diff --git a/net/mac80211/rc80211_pid_algo.c b/net/mac80211/rc80211_pid_algo.c index a1993161de99..a849b745bdb5 100644 --- 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 88b8dc9999bb..ae75d4178739 100644 --- 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 0ac6db5c09ea..306eadb01fc4 100644 --- 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 5540cbf7c445..7d4fe4a52929 100644 --- 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 30fd328e9991..f8c95bc9659c 100644 --- 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 45d59f19c29f..dddbfd60f351 100644 --- 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 ffaee3253e19..b7c2ee763d9d 100644 --- 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 ea3fa0f91906..f35eaea98e73 100644 --- 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 57c404f3f6d0..cc9f715c7bfc 100644 --- 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 9f723938b63f..363779c50658 100644 --- 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 index a611c8bc76bd..69aed16faff3 100644 --- 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" |