From patchwork Tue Feb 28 15:00:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: alex.bluesman.smirnov@gmail.com X-Patchwork-Id: 143454 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 4625AB6EE6 for ; Wed, 29 Feb 2012 01:05:56 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754686Ab2B1OFu (ORCPT ); Tue, 28 Feb 2012 09:05:50 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:37550 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753994Ab2B1OFr (ORCPT ); Tue, 28 Feb 2012 09:05:47 -0500 Received: by mail-ee0-f46.google.com with SMTP id c41so1150165eek.19 for ; Tue, 28 Feb 2012 06:05:46 -0800 (PST) Received-SPF: pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 10.14.99.2 as permitted sender) client-ip=10.14.99.2; Authentication-Results: mr.google.com; spf=pass (google.com: domain of alex.bluesman.smirnov@gmail.com designates 10.14.99.2 as permitted sender) smtp.mail=alex.bluesman.smirnov@gmail.com; dkim=pass header.i=alex.bluesman.smirnov@gmail.com Received: from mr.google.com ([10.14.99.2]) by 10.14.99.2 with SMTP id w2mr11425640eef.69.1330437946506 (num_hops = 1); Tue, 28 Feb 2012 06:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=1MseMBGqWAyFPfZQe139EWJ2AhMoVTZ6s0hHacLhdCU=; b=B6f08F/KuYgU65MPsL9iqF3E5fjnaO2dim2H7hVZ3Olq98oERvgKnvzmGmrpb2Tc7H wTqIQtrEKpJdq/ZTM4iCq2RzgZN+XSr+2gn52gGt/1pcbFIhmWucpXhIOS7COAlNYwpX Mcyj16INcwtteiV437b4OkFnZ6Sqj+b2HcPaw= Received: by 10.14.99.2 with SMTP id w2mr8551624eef.69.1330437946401; Tue, 28 Feb 2012 06:05:46 -0800 (PST) Received: from localhost.localdomain ([91.213.169.4]) by mx.google.com with ESMTPS id v51sm70715974eef.2.2012.02.28.06.05.44 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Feb 2012 06:05:45 -0800 (PST) From: Alexander Smirnov To: netdev@vger.kernel.org Cc: davem@davemloft.net, linux-zigbee-devel@lists.sourceforge.net, dbaryshkov@gmail.com, Alexander Smirnov Subject: [PATCH 03/13] mac802154: RX data path Date: Tue, 28 Feb 2012 18:00:22 +0300 Message-Id: <1330441232-17650-4-git-send-email-alex.bluesman.smirnov@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1330441232-17650-1-git-send-email-alex.bluesman.smirnov@gmail.com> References: <1330441232-17650-1-git-send-email-alex.bluesman.smirnov@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Main RX data path implementation between physical and mac layers. Both contexts are supported: interrupt (data processed via worker) and non-interrupt (data processed directly). Signed-off-by: Alexander Smirnov --- include/net/ieee802154_netdev.h | 2 + include/net/mac802154.h | 4 ++ net/mac802154/Makefile | 2 +- net/mac802154/rx.c | 109 +++++++++++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 1 deletions(-) create mode 100644 net/mac802154/rx.c diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h index 5743055..12a7ee4 100644 --- a/include/net/ieee802154_netdev.h +++ b/include/net/ieee802154_netdev.h @@ -26,6 +26,8 @@ #ifndef IEEE802154_NETDEVICE_H #define IEEE802154_NETDEVICE_H +#include + /* * A control block of skb passed between the ARPHRD_IEEE802154 device * and other stack parts. diff --git a/include/net/mac802154.h b/include/net/mac802154.h index ef27d07..cdc0100 100644 --- a/include/net/mac802154.h +++ b/include/net/mac802154.h @@ -134,4 +134,8 @@ void ieee802154_free_device(struct ieee802154_dev *dev); int ieee802154_register_device(struct ieee802154_dev *dev); void ieee802154_unregister_device(struct ieee802154_dev *dev); +void ieee802154_rx(struct ieee802154_dev *dev, struct sk_buff *skb, u8 lqi); +void ieee802154_rx_irqsafe(struct ieee802154_dev *dev, struct sk_buff *skb, + u8 lqi); + #endif /* NET_MAC802154_H */ diff --git a/net/mac802154/Makefile b/net/mac802154/Makefile index cda9393..e00fe47 100644 --- a/net/mac802154/Makefile +++ b/net/mac802154/Makefile @@ -1,2 +1,2 @@ obj-$(CONFIG_MAC802154) += mac802154.o -mac802154-objs := ieee802154_dev.o +mac802154-objs := ieee802154_dev.o rx.o diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c new file mode 100644 index 0000000..3446379 --- /dev/null +++ b/net/mac802154/rx.c @@ -0,0 +1,109 @@ +/* + * Copyright (C) 2007-2011 Siemens AG + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Written by: + * Pavel Smolenskiy + * Maxim Gorbachyov + * Dmitry Eremin-Solenikov + * Alexander Smirnov + */ + +#include +#include +#include +#include +#include + +#include +#include + +#include "mac802154.h" + +static void +mac802154_subif_rx(struct ieee802154_dev *hw, struct sk_buff *skb, u8 lqi) +{ + struct mac802154_priv *priv = mac802154_to_priv(hw); + + mac_cb(skb)->lqi = lqi; + skb->protocol = htons(ETH_P_IEEE802154); + skb_reset_mac_header(skb); + + BUILD_BUG_ON(sizeof(struct ieee802154_mac_cb) > sizeof(skb->cb)); + + if (!(priv->hw.flags & IEEE802154_HW_OMIT_CKSUM)) { + u16 crc; + + if (skb->len < 2) { + pr_debug("(%s): got invalid frame\n", __func__); + goto out; + } + crc = crc_ccitt(0, skb->data, skb->len); + if (crc) { + pr_debug("(%s): CRC mismatch\n", __func__); + goto out; + } + skb_trim(skb, skb->len - 2); /* CRC */ + } + +out: + dev_kfree_skb(skb); + return; +} + +struct rx_work { + struct sk_buff *skb; + struct work_struct work; + struct ieee802154_dev *dev; + u8 lqi; +}; + +static void mac802154_rx_worker(struct work_struct *work) +{ + struct rx_work *rw = container_of(work, struct rx_work, work); + struct sk_buff *skb = rw->skb; + + mac802154_subif_rx(rw->dev, skb, rw->lqi); + kfree(rw); +} + +void +ieee802154_rx_irqsafe(struct ieee802154_dev *dev, struct sk_buff *skb, u8 lqi) +{ + struct mac802154_priv *priv = mac802154_to_priv(dev); + struct rx_work *work; + + if (!skb) + return; + + work = kzalloc(sizeof(struct rx_work), GFP_ATOMIC); + if (!work) + return; + + INIT_WORK(&work->work, mac802154_rx_worker); + work->skb = skb; + work->dev = dev; + work->lqi = lqi; + + queue_work(priv->dev_workqueue, &work->work); +} +EXPORT_SYMBOL(ieee802154_rx_irqsafe); + +void mac802154_rx(struct ieee802154_dev *dev, struct sk_buff *skb, u8 lqi) +{ + if (skb) + mac802154_subif_rx(dev, skb, lqi); +} +EXPORT_SYMBOL(mac802154_rx);