add updated mac80211 - this no longer relies on patching includes in the kernel trees...

[openwrt/svn-archive/archive.git] / package / mac80211 / src / wireless / core.c

diff --git a/package/mac80211/src/wireless/core.c b/package/mac80211/src/wireless/core.c
index 46e5ae07044fdf811602253347f3c8ca48ba1e43..35b79bee3a628ac890db77694db85dc6d9121e17 100644 (file)
--- a/package/mac80211/src/wireless/core.c
+++ b/package/mac80211/src/wireless/core.c
@@ -162,10 +162,15 @@ int cfg80211_dev_rename(struct cfg80211_registered_device *rdev,
 
        /* this will check for collisions */
        result = device_rename(&rdev->wiphy.dev, newname);
-       if (!result)
+       if (result)
                return result;
 
-       /* TODO: do debugfs rename! */
+       if (!debugfs_rename(rdev->wiphy.debugfsdir->d_parent,
+                           rdev->wiphy.debugfsdir,
+                           rdev->wiphy.debugfsdir->d_parent,
+                           newname))
+               printk(KERN_ERR "cfg80211: failed to rename debugfs dir to %s!\n",
+                      newname);
 
        nl80211_notify_dev_rename(rdev);
 
@@ -355,7 +360,7 @@ out_fail_notifier:
 out_fail_sysfs:
        return err;
 }
-module_init(cfg80211_init);
+subsys_initcall(cfg80211_init);
 
 static void cfg80211_exit(void)
 {