[MAC80211]: rename ieee80211_cfg.h to cfg.h

Might as well rename ieee80211_cfg.h to cfg.h to keep things consistent.

Signed-off-by: Michael Wu <flamingice@sourmilk.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index d6fc55cc8ad4778d1c55681d5d4f8440eb46fc90..6981ba178e1918995fab1e7f9398ef1e0c87e992 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -11,7 +11,7 @@
 #include <net/net_namespace.h>
 #include <net/cfg80211.h>
 #include "ieee80211_i.h"
-#include "ieee80211_cfg.h"
+#include "cfg.h"
 
 static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
                               enum nl80211_iftype type)

diff --git a/net/mac80211/ieee80211_cfg.h b/net/mac80211/cfg.h
similarity index 55%
rename from net/mac80211/ieee80211_cfg.h
rename to net/mac80211/cfg.h
index 85ed2c924878cf4762558977dace9525e3c50859..7d7879f5b00b9d9fb7aa42ca8695d04e330dadb0 100644 (file)
--- a/net/mac80211/ieee80211_cfg.h
+++ b/net/mac80211/cfg.h
@@ -1,9 +1,9 @@
 /*
  * mac80211 configuration hooks for cfg80211
  */
-#ifndef __IEEE80211_CFG_H
-#define __IEEE80211_CFG_H
+#ifndef __CFG_H
+#define __CFG_H
 
 extern struct cfg80211_ops mac80211_config_ops;
 
-#endif /* __IEEE80211_CFG_H */
+#endif /* __CFG_H */

diff --git a/net/mac80211/ieee80211.c b/net/mac80211/ieee80211.c
index 4a213a20373a51607741ac6cd714ff7b05eb3cbd..89be6629cfc0544d8e4e0437bdc2ff49c9372d55 100644 (file)
--- a/net/mac80211/ieee80211.c
+++ b/net/mac80211/ieee80211.c
@@ -31,7 +31,7 @@
 #include "wme.h"
 #include "aes_ccm.h"
 #include "ieee80211_led.h"
-#include "ieee80211_cfg.h"
+#include "cfg.h"
 #include "debugfs.h"
 #include "debugfs_netdev.h"