From: Alexander Aring <aar@pengutronix.de>
To: linux-wpan@vger.kernel.org
Cc: kernel@pengutronix.de, linux-bluetooth@vger.kernel.org,
Alexander Aring <aar@pengutronix.de>
Subject: [RFCv2 bluetooth-next 13/19] 6lowpan: move dev_init to generic
Date: Sun, 7 Aug 2016 16:30:50 +0200 [thread overview]
Message-ID: <20160807143056.3116-14-aar@pengutronix.de> (raw)
In-Reply-To: <20160807143056.3116-1-aar@pengutronix.de>
This functionality need to be implemented on all 6LoWPAN interfaces so
we move this to generic 6LoWPAN.
Signed-off-by: Alexander Aring <aar@pengutronix.de>
---
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.2
next prev parent reply other threads:[~2016-08-07 14:30 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-07 14:30 [RFCv2 bluetooth-next 00/19] bluetooth: rework 6lowpan implementation Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 01/19] ieee802154: 6lowpan: remove headroom check Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 02/19] ieee802154: 6lowpan: move skb cb BUILD_BUG_ON check Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 03/19] 6lowpan: remove LOWPAN_IPHC_MAX_HEADER_LEN Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 04/19] 6lowpan: hold netdev while unregister Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 05/19] 6lowpan: introduce generic default naming Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 06/19] 6lowpan: move rx defines to generic Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 07/19] bluetooth: introduce l2cap_hdev_chan_connect Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 08/19] bluetooth: add hci dev notifier Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 09/19] bluetooth: introduce l2cap chan priv data Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 10/19] bluetooth: export functions and variables Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 11/19] 6lowpan: bluetooth: remove implementation Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 12/19] ieee802154: 6lowpan: move header create to 6lowpan Alexander Aring
2016-08-07 14:30 ` Alexander Aring [this message]
2016-08-07 14:30 ` [RFCv2 bluetooth-next 14/19] 6lowpan: iphc: override l2 packet information Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 15/19] ipv6: addrconf: fix 48 bit 6lowpan autoconfiguration Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 16/19] 6lowpan: iphc: add handling for btle Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 17/19] 6lowpan: move multicast flags to generic Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 18/19] 6lowpan: move addr_len setting away from generic Alexander Aring
2016-08-07 14:30 ` [RFCv2 bluetooth-next 19/19] 6lowpan: bluetooth: add new implementation Alexander Aring
2016-08-08 12:10 ` [RFCv2 bluetooth-next 00/19] bluetooth: rework 6lowpan implementation Alexander Aring
2016-11-22 12:14 ` Luiz Augusto von Dentz
2016-11-22 15:41 ` Alexander Aring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160807143056.3116-14-aar@pengutronix.de \
--to=aar@pengutronix.de \
--cc=kernel@pengutronix.de \
--cc=linux-bluetooth@vger.kernel.org \
--cc=linux-wpan@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).