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

It's just painful to have the extra ieee80211_ prefix.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
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/Makefile b/net/mac80211/Makefile
index 793733835628271babce59faa777b74de8f53768..219cd9f9341fe099bc0ce5ba69c2da7442339ab8 100644 (file)
--- a/net/mac80211/Makefile
+++ b/net/mac80211/Makefile
@@ -17,7 +17,7 @@ mac80211-objs := \
        regdomain.o \
        tkip.o \
        aes_ccm.o \
-       ieee80211_cfg.o \
+       cfg.o \
        rx.o \
        tx.o \
        key.o \

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
new file mode 100644 (file)
index 0000000..d6fc55c
--- /dev/null
+++ b/net/mac80211/cfg.c
@@ -0,0 +1,67 @@
+/*
+ * mac80211 configuration hooks for cfg80211
+ *
+ * Copyright 2006      Johannes Berg <johannes@sipsolutions.net>
+ *
+ * This file is GPLv2 as found in COPYING.
+ */
+
+#include <linux/nl80211.h>
+#include <linux/rtnetlink.h>
+#include <net/net_namespace.h>
+#include <net/cfg80211.h>
+#include "ieee80211_i.h"
+#include "ieee80211_cfg.h"
+
+static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
+                              enum nl80211_iftype type)
+{
+       struct ieee80211_local *local = wiphy_priv(wiphy);
+       int itype;
+
+       if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
+               return -ENODEV;
+
+       switch (type) {
+       case NL80211_IFTYPE_UNSPECIFIED:
+               itype = IEEE80211_IF_TYPE_STA;
+               break;
+       case NL80211_IFTYPE_ADHOC:
+               itype = IEEE80211_IF_TYPE_IBSS;
+               break;
+       case NL80211_IFTYPE_STATION:
+               itype = IEEE80211_IF_TYPE_STA;
+               break;
+       case NL80211_IFTYPE_MONITOR:
+               itype = IEEE80211_IF_TYPE_MNTR;
+               break;
+       default:
+               return -EINVAL;
+       }
+
+       return ieee80211_if_add(local->mdev, name, NULL, itype);
+}
+
+static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)
+{
+       struct ieee80211_local *local = wiphy_priv(wiphy);
+       struct net_device *dev;
+       char *name;
+
+       if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
+               return -ENODEV;
+
+       dev = dev_get_by_index(&init_net, ifindex);
+       if (!dev)
+               return 0;
+
+       name = dev->name;
+       dev_put(dev);
+
+       return ieee80211_if_remove(local->mdev, name, -1);
+}
+
+struct cfg80211_ops mac80211_config_ops = {
+       .add_virtual_intf = ieee80211_add_iface,
+       .del_virtual_intf = ieee80211_del_iface,
+};

diff --git a/net/mac80211/ieee80211_cfg.c b/net/mac80211/ieee80211_cfg.c
deleted file mode 100644 (file)
index d6fc55c..0000000
--- a/net/mac80211/ieee80211_cfg.c
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * mac80211 configuration hooks for cfg80211
- *
- * Copyright 2006      Johannes Berg <johannes@sipsolutions.net>
- *
- * This file is GPLv2 as found in COPYING.
- */
-
-#include <linux/nl80211.h>
-#include <linux/rtnetlink.h>
-#include <net/net_namespace.h>
-#include <net/cfg80211.h>
-#include "ieee80211_i.h"
-#include "ieee80211_cfg.h"
-
-static int ieee80211_add_iface(struct wiphy *wiphy, char *name,
-                              enum nl80211_iftype type)
-{
-       struct ieee80211_local *local = wiphy_priv(wiphy);
-       int itype;
-
-       if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
-               return -ENODEV;
-
-       switch (type) {
-       case NL80211_IFTYPE_UNSPECIFIED:
-               itype = IEEE80211_IF_TYPE_STA;
-               break;
-       case NL80211_IFTYPE_ADHOC:
-               itype = IEEE80211_IF_TYPE_IBSS;
-               break;
-       case NL80211_IFTYPE_STATION:
-               itype = IEEE80211_IF_TYPE_STA;
-               break;
-       case NL80211_IFTYPE_MONITOR:
-               itype = IEEE80211_IF_TYPE_MNTR;
-               break;
-       default:
-               return -EINVAL;
-       }
-
-       return ieee80211_if_add(local->mdev, name, NULL, itype);
-}
-
-static int ieee80211_del_iface(struct wiphy *wiphy, int ifindex)
-{
-       struct ieee80211_local *local = wiphy_priv(wiphy);
-       struct net_device *dev;
-       char *name;
-
-       if (unlikely(local->reg_state != IEEE80211_DEV_REGISTERED))
-               return -ENODEV;
-
-       dev = dev_get_by_index(&init_net, ifindex);
-       if (!dev)
-               return 0;
-
-       name = dev->name;
-       dev_put(dev);
-
-       return ieee80211_if_remove(local->mdev, name, -1);
-}
-
-struct cfg80211_ops mac80211_config_ops = {
-       .add_virtual_intf = ieee80211_add_iface,
-       .del_virtual_intf = ieee80211_del_iface,
-};