From patchwork Sun Aug 7 14:30:43 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 9266389 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 CB3F460754 for ; Sun, 7 Aug 2016 14:33:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD20F26C2F for ; Sun, 7 Aug 2016 14:33:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B1BCC27E5A; Sun, 7 Aug 2016 14:33:26 +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 5CF2226C2F for ; Sun, 7 Aug 2016 14:33:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752001AbcHGOdZ (ORCPT ); Sun, 7 Aug 2016 10:33:25 -0400 Received: from metis.ext.4.pengutronix.de ([92.198.50.35]:34783 "EHLO metis.ext.4.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751997AbcHGOdD (ORCPT ); Sun, 7 Aug 2016 10:33:03 -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 1bWP8P-0001Um-P6; Sun, 07 Aug 2016 16:33:01 +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 06/19] 6lowpan: move rx defines to generic Date: Sun, 7 Aug 2016 16:30:43 +0200 Message-Id: <20160807143056.3116-7-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 patch prepares to use 802.15.4 6LoWPAN receive handling also for BTLE 6LoWPAN. Signed-off-by: Alexander Aring --- include/net/6lowpan.h | 6 ++++++ net/ieee802154/6lowpan/6lowpan_i.h | 6 ------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/net/6lowpan.h b/include/net/6lowpan.h index 2570237..90d9d08 100644 --- a/include/net/6lowpan.h +++ b/include/net/6lowpan.h @@ -80,6 +80,12 @@ #define LOWPAN_IFNAME_TEMPLATE "6lo%d" +typedef unsigned __bitwise__ lowpan_rx_result; +#define RX_CONTINUE ((__force lowpan_rx_result) 0u) +#define RX_DROP_UNUSABLE ((__force lowpan_rx_result) 1u) +#define RX_DROP ((__force lowpan_rx_result) 2u) +#define RX_QUEUED ((__force lowpan_rx_result) 3u) + static inline bool lowpan_is_ipv6(u8 dispatch) { return dispatch == LOWPAN_DISPATCH_IPV6; diff --git a/net/ieee802154/6lowpan/6lowpan_i.h b/net/ieee802154/6lowpan/6lowpan_i.h index 5ac7789..39b739f 100644 --- a/net/ieee802154/6lowpan/6lowpan_i.h +++ b/net/ieee802154/6lowpan/6lowpan_i.h @@ -7,12 +7,6 @@ #include #include -typedef unsigned __bitwise__ lowpan_rx_result; -#define RX_CONTINUE ((__force lowpan_rx_result) 0u) -#define RX_DROP_UNUSABLE ((__force lowpan_rx_result) 1u) -#define RX_DROP ((__force lowpan_rx_result) 2u) -#define RX_QUEUED ((__force lowpan_rx_result) 3u) - #define LOWPAN_DISPATCH_FRAG1 0xc0 #define LOWPAN_DISPATCH_FRAGN 0xe0