From patchwork Thu Apr 16 13:35:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dirk Neukirchen X-Patchwork-Id: 461765 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47C761402E1 for ; Thu, 16 Apr 2015 23:36:23 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id EF41528073C; Thu, 16 Apr 2015 15:35:19 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,FREEMAIL_FROM, T_RP_MATCHES_RCVD autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id C1146280463; Thu, 16 Apr 2015 15:35:15 +0200 (CEST) X-policyd-weight: using cached result; rate: -8.5 Received: from mout.web.de (mout.web.de [212.227.17.11]) by arrakis.dune.hu (Postfix) with ESMTPS; Thu, 16 Apr 2015 15:35:15 +0200 (CEST) Received: from [192.168.3.157] ([91.64.206.248]) by smtp.web.de (mrweb101) with ESMTPSA (Nemesis) id 0LdEsP-1Z8gzh0wqX-00iTSZ; Thu, 16 Apr 2015 15:36:08 +0200 Message-ID: <552FBAB7.1090205@web.de> Date: Thu, 16 Apr 2015 15:35:51 +0200 From: Dirk Neukirchen User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: John Crispin , openwrt-devel@lists.openwrt.org References: <5527FBEC.6080303@web.de> <552D38C2.4070801@openwrt.org> In-Reply-To: <552D38C2.4070801@openwrt.org> X-Provags-ID: V03:K0://fDfVsNUTjuK5zWmNAxwm/pBQfv3BzEG9gLQY85N4KbBtwnGvK RnFw96ecm7JSbXg3tbm6CE3NyQ9U0XN6HtJ39NMMLaPsZfDKDoyApBSM0vMXrKanE9hkp0j FNUSVNODDNyhLNWnKa+5D9ztYmrDg9icKK6nozsUN+i1oGuws0F3M1Dgb9l706I78RxKeea m7mYdNTgLJj0IG8dhlx1Q== X-UI-Out-Filterresults: notjunk:1; Subject: [OpenWrt-Devel] [Patch v2] wpan: rework bluetooth / wpan and 6lowpan dependencies X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" - remove/rename of 6lowpan-iphc upstream change in 3.17: 6lowpan: introduce new net/6lowpan directory id: 2c6bed7cfcd3f594ed9e4d6919fa2ebea2243d19 Signed-off-by: Dirk Neukirchen --- package/kernel/linux/modules/other.mk | 30 +++++++++++++----------------- package/kernel/linux/modules/wpan.mk | 8 +++++--- 2 files changed, 18 insertions(+), 20 deletions(-) diff --git a/package/kernel/linux/modules/other.mk b/package/kernel/linux/modules/other.mk index a93583b..a7084c8 100644 --- a/package/kernel/linux/modules/other.mk +++ b/package/kernel/linux/modules/other.mk @@ -10,25 +10,25 @@ OTHER_MENU:=Other modules WATCHDOG_DIR:=watchdog -define KernelPackage/6lowpan-iphc - USBMENU:=$(OTHER_MENU) - TITLE:=6lowpan shared code - KCONFIG:=CONFIG_6LOWPAN_IPHC - HIDDEN:=1 - FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan_iphc.ko - AUTOLOAD:=$(call Autoprobe,6lowpan_iphc) +define KernelPackage/6lowpan + SUBMENU:=$(OTHER_MENU) + TITLE:=6LoWPAN shared code + KCONFIG:=CONFIG_6LOWPAN + FILES:=$(LINUX_DIR)/net/6lowpan/6lowpan.ko + AUTOLOAD:=$(call AutoProbe,6lowpan) endef -define KernelPackage/6lowpan-iphc/description +define KernelPackage/6lowpan/description Shared 6lowpan code for IEEE 802.15.4 and Bluetooth. endef -$(eval $(call KernelPackage,6lowpan-iphc)) +$(eval $(call KernelPackage,6lowpan)) + define KernelPackage/bluetooth SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth support - DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-6lowpan-iphc +kmod-lib-crc16 +kmod-hid + DEPENDS:=@USB_SUPPORT +kmod-usb-core +kmod-crypto-hash +kmod-lib-crc16 +kmod-hid KCONFIG:= \ CONFIG_BLUEZ \ CONFIG_BLUEZ_L2CAP \ @@ -70,13 +70,9 @@ $(eval $(call KernelPackage,bluetooth)) define KernelPackage/bluetooth_6lowpan SUBMENU:=$(OTHER_MENU) TITLE:=Bluetooth 6LoWPAN support - DEPENDS:=+kmod-bluetooth - KCONFIG:= \ - CONFIG_6LOWPAN=m \ - CONFIG_BT_6LOWPAN=m - FILES:= \ - $(LINUX_DIR)/net/bluetooth/bluetooth_6lowpan.ko \ - $(LINUX_DIR)/net/6lowpan/6lowpan.ko + DEPENDS:=+kmod-6lowpan +kmod-bluetooth + KCONFIG:=CONFIG_BT_6LOWPAN + FILES:=$(LINUX_DIR)/net/bluetooth/bluetooth_6lowpan.ko AUTOLOAD:=$(call AutoProbe,bluetooth) endef diff --git a/package/kernel/linux/modules/wpan.mk b/package/kernel/linux/modules/wpan.mk index 0b1f33a..f544f61 100644 --- a/package/kernel/linux/modules/wpan.mk +++ b/package/kernel/linux/modules/wpan.mk @@ -15,7 +15,7 @@ define KernelPackage/ieee802154 CONFIG_IEEE802154_SOCKET=y FILES:= \ $(LINUX_DIR)/net/ieee802154/ieee802154.ko \ - $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko + $(LINUX_DIR)/net/ieee802154/ieee802154_socket.ko@ge4.0 AUTOLOAD:=$(call AutoLoad,90,ieee802154 ieee802154_socket) endef @@ -108,9 +108,11 @@ $(eval $(call KernelPackage,cc2520)) define KernelPackage/ieee802154_6lowpan SUBMENU:=$(WPAN_MENU) TITLE:= 6LoWPAN support over IEEE-802.15.4 - DEPENDS:=@LINUX_4_0 + DEPENDS:=@LINUX_4_0 +kmod-6lowpan KCONFIG:=CONFIG_IEEE802154_6LOWPAN - FILES:=$(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko + FILES:= \ + $(LINUX_DIR)/net/ieee802154/6lowpan/ieee802154_6lowpan.ko@ge4.0 \ + $(LINUX_DIR)/net/ieee802154/ieee802154_6lowpan.ko@lt4.0 AUTOLOAD:=$(call AutoLoad,91,ieee802154_6lowpan) endef