From dfba7132b8fe3307c2d03f88061d94784f7c8828 Mon Sep 17 00:00:00 2001
From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Date: Thu, 10 Sep 2009 17:50:12 +0400
Subject: [PATCH] --- yaml --- r: 171259 b: refs/heads/master c:
 cb6b3763571570ebde1e82524c8a45a4275c8f11 h: refs/heads/master i:   171257:
 560a4cde9491b55968964880f069135b8a2926ef   171255:
 47d4619de2be9161f173594a3005b6c97e3ff8e0 v: v3

---
 [refs]                            |  2 +-
 trunk/net/ieee802154/Makefile     |  4 ++--
 trunk/net/ieee802154/netlink.c    |  9 ++-------
 trunk/net/ieee802154/wpan-class.c | 23 ++++++++++++++++++++---
 4 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 23f7ecb21b34..24fcf4fb6194 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9966b580a3e9d7cf820b5360b574f439d813ef4
+refs/heads/master: cb6b3763571570ebde1e82524c8a45a4275c8f11
diff --git a/trunk/net/ieee802154/Makefile b/trunk/net/ieee802154/Makefile
index 4068a9f5113e..42b1f0dc138e 100644
--- a/trunk/net/ieee802154/Makefile
+++ b/trunk/net/ieee802154/Makefile
@@ -1,5 +1,5 @@
-obj-$(CONFIG_IEEE802154) +=	nl802154.o af_802154.o wpan-class.o
-nl802154-y		:= netlink.o nl_policy.o
+obj-$(CONFIG_IEEE802154) +=	ieee802154.o af_802154.o
+ieee802154-y		:= netlink.o nl_policy.o wpan-class.o
 af_802154-y		:= af_ieee802154.o raw.o dgram.o
 
 ccflags-y += -Wall -DDEBUG
diff --git a/trunk/net/ieee802154/netlink.c b/trunk/net/ieee802154/netlink.c
index ca767bde17a4..0fadd6bd77f6 100644
--- a/trunk/net/ieee802154/netlink.c
+++ b/trunk/net/ieee802154/netlink.c
@@ -643,7 +643,7 @@ static struct genl_ops ieee802154_coordinator_ops[] = {
 							ieee802154_dump_iface),
 };
 
-static int __init ieee802154_nl_init(void)
+int __init ieee802154_nl_init(void)
 {
 	int rc;
 	int i;
@@ -676,14 +676,9 @@ static int __init ieee802154_nl_init(void)
 	genl_unregister_family(&ieee802154_coordinator_family);
 	return rc;
 }
-module_init(ieee802154_nl_init);
 
-static void __exit ieee802154_nl_exit(void)
+void __exit ieee802154_nl_exit(void)
 {
 	genl_unregister_family(&ieee802154_coordinator_family);
 }
-module_exit(ieee802154_nl_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_DESCRIPTION("ieee 802.15.4 configuration interface");
 
diff --git a/trunk/net/ieee802154/wpan-class.c b/trunk/net/ieee802154/wpan-class.c
index cd42e88b8397..38bac70cca10 100644
--- a/trunk/net/ieee802154/wpan-class.c
+++ b/trunk/net/ieee802154/wpan-class.c
@@ -22,6 +22,8 @@
 
 #include <net/wpan-phy.h>
 
+#include "ieee802154.h"
+
 #define MASTER_SHOW_COMPLEX(name, format_string, args...)		\
 static ssize_t name ## _show(struct device *dev,			\
 			    struct device_attribute *attr, char *buf)	\
@@ -188,16 +190,31 @@ EXPORT_SYMBOL(wpan_phy_free);
 
 static int __init wpan_phy_class_init(void)
 {
-	return class_register(&wpan_phy_class);
+	int rc;
+	rc = class_register(&wpan_phy_class);
+	if (rc)
+		goto err;
+
+	rc = ieee802154_nl_init();
+	if (rc)
+		goto err_nl;
+
+	return 0;
+err_nl:
+	class_unregister(&wpan_phy_class);
+err:
+	return rc;
 }
-subsys_initcall(wpan_phy_class_init);
+module_init(wpan_phy_class_init);
 
 static void __exit wpan_phy_class_exit(void)
 {
+	ieee802154_nl_exit();
 	class_unregister(&wpan_phy_class);
 }
 module_exit(wpan_phy_class_exit);
 
-MODULE_DESCRIPTION("IEEE 802.15.4 device class");
 MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("IEEE 802.15.4 configuration interface");
+MODULE_AUTHOR("Dmitry Eremin-Solenikov");