From patchwork Thu Mar 10 18:14:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: web+oss@zopieux.com X-Patchwork-Id: 8559281 Return-Path: X-Original-To: patchwork-linux-wpan@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 49EF79F7CA for ; Thu, 10 Mar 2016 18:15:04 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4962E2011D for ; Thu, 10 Mar 2016 18:15:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E28B62012B for ; Thu, 10 Mar 2016 18:15:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754272AbcCJSPA (ORCPT ); Thu, 10 Mar 2016 13:15:00 -0500 Received: from r0.smtpout1.alwaysdata.com ([176.31.58.0]:35357 "EHLO r0.smtpout1.alwaysdata.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460AbcCJSO7 (ORCPT ); Thu, 10 Mar 2016 13:14:59 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=alwaysdata.net; s=zopieux; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From; bh=mWAk5v/0VnA5L1ZlMClSMA+TIWpc56YXCcYg2r4rpVw=; b=vMhbBMPV8AJI2AjiRBJAVRKrcklngE1hjk1ev1Y6zKyxLdl/BCz3aeDGuZ12b3HdiRwl4uX/RtILvk6p0VhOjSkV6xOCdZB9erhOZJnib7R2yPjqaMkX9+qCaPDYwBUB0jzqcfkjRcLq9CnBDyLdmE+OB6qVzQtZtoeBR46b+x8=; Received: from agrenoble-651-1-452-143.w82-122.abo.wanadoo.fr ([82.122.156.143] helo=alex-arch-laptop.localdomain) by smtpout1.roubaix1.alwaysdata.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_CBC_SHA256:128) (Exim 4.84) (envelope-from ) id 1ae56u-0001jE-5r; Thu, 10 Mar 2016 19:14:56 +0100 From: web+oss@zopieux.com To: linux-wpan@vger.kernel.org Cc: Alexandre Macabies , Alexander Aring Subject: [PATCH 3/3] mrf24j40: apply the security-enabled bit on secured outbound frames Date: Thu, 10 Mar 2016 19:14:03 +0100 Message-Id: <1457633643-12535-3-git-send-email-web+oss@zopieux.com> X-Mailer: git-send-email 2.7.2 In-Reply-To: <1457633643-12535-1-git-send-email-web+oss@zopieux.com> References: <1457633643-12535-1-git-send-email-web+oss@zopieux.com> X-alwaysdata-ID: 132090412 Sender: linux-wpan-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wpan@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Alexandre Macabies We set the TXNSECEN bit of register TXNCON to on when transmitting a security-enabled frame, as described in section 3.12.2 of the MRF datasheet. Signed-off-by: Alexander Aring Reported-by: Alexandre Macabies Tested-by: Alexandre Macabies Reviewed-by: Stefan Schmidt --- drivers/net/ieee802154/mrf24j40.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/ieee802154/mrf24j40.c b/drivers/net/ieee802154/mrf24j40.c index 96814cf..bf11cbb 100644 --- a/drivers/net/ieee802154/mrf24j40.c +++ b/drivers/net/ieee802154/mrf24j40.c @@ -61,6 +61,7 @@ #define REG_TXBCON0 0x1A #define REG_TXNCON 0x1B /* Transmit Normal FIFO Control */ #define BIT_TXNTRIG BIT(0) +#define BIT_TXNSECEN BIT(1) #define BIT_TXNACKREQ BIT(2) #define REG_TXG1CON 0x1C @@ -550,6 +551,9 @@ static void write_tx_buf_complete(void *context) u8 val = BIT_TXNTRIG; int ret; + if (ieee802154_is_secen(fc)) + val |= BIT_TXNSECEN; + if (ieee802154_is_ackreq(fc)) val |= BIT_TXNACKREQ;