summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAlexander Aring <alex.aring@gmail.com>2015-12-15 12:25:35 +0100
committerMarcel Holtmann <marcel@holtmann.org>2015-12-20 08:21:00 +0100
commit92e17ee72a60b126263cbcd749e5da688e0198a3 (patch)
treed5058e90ef47bc3578ce61300d8489ec4aa08388 /net
parent7eb7404f7ee4bf59cb034897ab678aba2755c5e0 (diff)
downloadlinux-92e17ee72a60b126263cbcd749e5da688e0198a3.tar.bz2
6lowpan: fix debugfs interface entry name
This patches moves the debugfs interface related register after netdevice register. The function lowpan_dev_debugfs_init will use "dev->name" which can be before register_netdevice a format string. The function register_netdevice will evaluate the format string if necessary and replace "dev->name" to the real interface name. Reported-by: Lukasz Duda <lukasz.duda@nordicsemi.no> Signed-off-by: Alexander Aring <alex.aring@gmail.com> Acked-by: Lukasz Duda <lukasz.duda@nordicsemi.no> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net')
-rw-r--r--net/6lowpan/core.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/net/6lowpan/core.c b/net/6lowpan/core.c
index c7f06f5c0121..faf65baed617 100644
--- a/net/6lowpan/core.c
+++ b/net/6lowpan/core.c
@@ -29,13 +29,13 @@ int lowpan_register_netdevice(struct net_device *dev,
lowpan_priv(dev)->lltype = lltype;
- ret = lowpan_dev_debugfs_init(dev);
+ ret = register_netdevice(dev);
if (ret < 0)
return ret;
- ret = register_netdevice(dev);
+ ret = lowpan_dev_debugfs_init(dev);
if (ret < 0)
- lowpan_dev_debugfs_exit(dev);
+ unregister_netdevice(dev);
return ret;
}