[RFC bluetooth-next 14/20] 6lowpan: move dev_init to generic
flat view
From: Alexander Aring <hidden>
Date: 2016-07-11 19:50:38
Subsystem:
6lowpan generic (btle/ieee 802.15.4), ieee 802.15.4 subsystem, networking [general], the rest · Maintainers:
Alexander Aring, Stefan Schmidt, Miquel Raynal, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
This functionality need to be implemented on all 6LoWPAN interfaces so we move this to generic 6LoWPAN. Signed-off-by: Alexander Aring <redacted> --- include/net/6lowpan.h | 2 ++ net/6lowpan/core.c | 8 ++++++++ net/ieee802154/6lowpan/core.c | 7 ------- 3 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h
index 9a6282b..6a60df9 100644
--- a/include/net/6lowpan.h
+++ b/include/net/6lowpan.h@@ -286,6 +286,8 @@ int lowpan_register_netdev(struct net_device *dev, void lowpan_unregister_netdevice(struct net_device *dev); void lowpan_unregister_netdev(struct net_device *dev); +int lowpan_dev_init(struct net_device *dev); + /** * lowpan_header_decompress - replace 6LoWPAN header with IPv6 header *
diff --git a/net/6lowpan/core.c b/net/6lowpan/core.c
index b01effd..a978000 100644
--- a/net/6lowpan/core.c
+++ b/net/6lowpan/core.c@@ -45,6 +45,14 @@ static struct header_ops header_ops = { .create = lowpan_header_create, }; +int lowpan_dev_init(struct net_device *dev) +{ + netdev_lockdep_set_classes(dev); + + return 0; +} +EXPORT_SYMBOL(lowpan_dev_init); + int lowpan_register_netdevice(struct net_device *dev, enum lowpan_lltypes lltype) {
diff --git a/net/ieee802154/6lowpan/core.c b/net/ieee802154/6lowpan/core.c
index 096a194..228a711 100644
--- a/net/ieee802154/6lowpan/core.c
+++ b/net/ieee802154/6lowpan/core.c@@ -54,13 +54,6 @@ static int open_count; -static int lowpan_dev_init(struct net_device *ldev) -{ - netdev_lockdep_set_classes(ldev); - - return 0; -} - static int lowpan_open(struct net_device *dev) { if (!open_count)
--
2.9.0