From patchwork Sun Aug 7 14:30:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 9266381 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 7BBC660754 for ; Sun, 7 Aug 2016 14:33:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6DFF326C2F for ; Sun, 7 Aug 2016 14:33:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6313827E5A; Sun, 7 Aug 2016 14:33:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AC8726C9B for ; Sun, 7 Aug 2016 14:33:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752119AbcHGOdS (ORCPT ); Sun, 7 Aug 2016 10:33:18 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:56404 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751758AbcHGOdF (ORCPT ); Sun, 7 Aug 2016 10:33:05 -0400 Received: from gallifrey.ext.pengutronix.de ([2001:67c:670:201:5054:ff:fe8d:eefb] helo=omega.localdomain) by metis.ext.pengutronix.de with esmtp (Exim 4.80) (envelope-from ) id 1bWP8R-0001Um-Bk; Sun, 07 Aug 2016 16:33:03 +0200 From: Alexander Aring To: linux-wpan@vger.kernel.org Cc: kernel@pengutronix.de, linux-bluetooth@vger.kernel.org, Alexander Aring Subject: [RFCv2 bluetooth-next 13/19] 6lowpan: move dev_init to generic Date: Sun, 7 Aug 2016 16:30:50 +0200 Message-Id: <20160807143056.3116-14-aar@pengutronix.de> X-Mailer: git-send-email 2.9.2 In-Reply-To: <20160807143056.3116-1-aar@pengutronix.de> References: <20160807143056.3116-1-aar@pengutronix.de> X-SA-Exim-Connect-IP: 2001:67c:670:201:5054:ff:fe8d:eefb X-SA-Exim-Mail-From: aar@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-wpan@vger.kernel.org Sender: linux-wpan-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wpan@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This functionality need to be implemented on all 6LoWPAN interfaces so we move this to generic 6LoWPAN. Signed-off-by: Alexander Aring --- 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)