From patchwork Wed Jun 7 21:07:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 103313 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2133994qgd; Wed, 7 Jun 2017 14:08:31 -0700 (PDT) X-Received: by 10.84.130.99 with SMTP id 90mr30125947plc.165.1496869710911; Wed, 07 Jun 2017 14:08:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496869710; cv=none; d=google.com; s=arc-20160816; b=YN/yJBEJsvh5/wU+8nlPNl10zMWNwGb1Zr1ihm1xR7xpenXaE3/GHaIvoSZ/qeM8lI 6iZY+u3EsNoaXLtB9tC8ZSod2dVe+mKLWCnLi1IuOetxy0+t2s6tWX/ij4RdBOSks9TU 7KUnwxhfqJo/jzSLOodQNrNayw7oomAZ+gKq77KLpd8meU28SBV/i1ULQ9qF53Lng6vs CmUt6UOvvxf6JBL7XNpQlD97Mx9CubMfhvDAijBxB9wyRAP0xY/a0k+mvCW+rF8euyO4 BsrfA1nTVSD3idCgwnEUmyYqfw4Unxo83/tfydGiUDwanDZkYyV6XenY/Rf02YMmGlNf dcbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=ZDli+ju3xukeebpOdUnUQQczHAQ9qeVy1KSorxXQB1Y=; b=polaorKbYLcABtBWBwZNY6GvU8X18b9omAiiBRmRpA/Soefw1XBc1rP7W5yzq3d+8w DWAD+WIYVeW7bBob3eRkWyzxRCts1Jtlzc4be7l76lWPc5fbWdEvfffVIcjUk03jTaI8 0wGvgWW9ZZJcNDDlzD8WZLY03jjzW9BW+Ie28t0lH5U2gV4eInZXGkK7+P4DBkyKL57S ckTsxmNJXBlzK5cwd+RcCmwQb3BHBHRwU9TYKkC2trFMSsYM/K4NMqOfkIqXfnvv74xU W6DfVSAEYzDrvmYHolW0lrG8ZnyqR9wbtpGqbL1w7CJp0iewFOeMoaG7Cd1IRkrp5QWg Jzzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s82si2622156pgs.324.2017.06.07.14.08.30; Wed, 07 Jun 2017 14:08:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751948AbdFGVHt (ORCPT + 25 others); Wed, 7 Jun 2017 17:07:49 -0400 Received: from mail-pf0-f171.google.com ([209.85.192.171]:33091 "EHLO mail-pf0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751843AbdFGVHp (ORCPT ); Wed, 7 Jun 2017 17:07:45 -0400 Received: by mail-pf0-f171.google.com with SMTP id 83so9676553pfr.0 for ; Wed, 07 Jun 2017 14:07:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ZDli+ju3xukeebpOdUnUQQczHAQ9qeVy1KSorxXQB1Y=; b=JYkRMk66P2woW4i7Qq6UThwhTij7lFM77LD6i2dfZT1MwX2jKwDYuPe1kzIgqYKKnF /3g0Lt4KbF9d5CBgHTJftPXKCmaAhTNi6Qv7x7qZJ+0dD3Q9DwGQ8OrgjNSPlHhYEMKR M/8FUcHN04Fk7/KcRTWQhFe+cIRaI1hQ0L908= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ZDli+ju3xukeebpOdUnUQQczHAQ9qeVy1KSorxXQB1Y=; b=oXDyFcQMBAkOSCePvkf7nwqAp/ZVZt9xq0b6BqdciqUkGcKFilZHDvSEAE2RMjvImb INBp53m7uPv8BRzVlLXQfASe6J+HpJ3p50MuCpSn6okkplz4Q4N58abq62KMJYF1047q crVkZpel7KYfp6ETYnlO+/yH4aN0xIDK2VqaHoTvp7GaTxhVvTQ0rPc8MDI18Bc08jud DmPiwbFLFYj1qpRgKnnGFWKYpk9NY8abpZuzcePNhyh59y3asg2DHEXvdSK0mYNeDPu2 5Q8Ou+i8Fz0N9VOFFe6ljE1ooWUaz89K+Hx/3jQEbOUWyadAPM9HIfk7+x06zvmoZ1yF l4ew== X-Gm-Message-State: AODbwcDrbR9Xsn+yg8uLdyZzkxy8hVXPqQRr7cKKrbP3j+znf7/sEw8d jR73HmA+EK+2PdWn X-Received: by 10.84.215.216 with SMTP id g24mr30015822plj.201.1496869664519; Wed, 07 Jun 2017 14:07:44 -0700 (PDT) Received: from localhost.localdomain (ip68-111-217-79.sd.sd.cox.net. [68.111.217.79]) by smtp.gmail.com with ESMTPSA id s131sm6564392pgs.6.2017.06.07.14.07.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jun 2017 14:07:43 -0700 (PDT) From: Bjorn Andersson To: "David S. Miller" Cc: Arun Kumar Neelakantam , netdev@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Courtney Cavin Subject: [RESEND PATCH 1/4] net: qrtr: Refactor packet allocation Date: Wed, 7 Jun 2017 14:07:36 -0700 Message-Id: <20170607210739.27263-2-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20170607210739.27263-1-bjorn.andersson@linaro.org> References: <20170607210739.27263-1-bjorn.andersson@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Extract the allocation and filling in the control message header fields to a separate function in order to reuse this in subsequent patches. Cc: Courtney Cavin Signed-off-by: Bjorn Andersson --- net/qrtr/qrtr.c | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) -- 2.12.0 diff --git a/net/qrtr/qrtr.c b/net/qrtr/qrtr.c index a9a8c7d5a4a9..86d35ed50da9 100644 --- a/net/qrtr/qrtr.c +++ b/net/qrtr/qrtr.c @@ -245,14 +245,11 @@ int qrtr_endpoint_post(struct qrtr_endpoint *ep, const void *data, size_t len) } EXPORT_SYMBOL_GPL(qrtr_endpoint_post); -/* Allocate and construct a resume-tx packet. */ -static struct sk_buff *qrtr_alloc_resume_tx(u32 src_node, - u32 dst_node, u32 port) +static struct sk_buff *qrtr_alloc_ctrl_packet(u32 type, size_t pkt_len, + u32 src_node, u32 dst_node) { - const int pkt_len = 20; struct qrtr_hdr *hdr; struct sk_buff *skb; - __le32 *buf; skb = alloc_skb(QRTR_HDR_SIZE + pkt_len, GFP_KERNEL); if (!skb) @@ -261,7 +258,7 @@ static struct sk_buff *qrtr_alloc_resume_tx(u32 src_node, hdr = (struct qrtr_hdr *)skb_put(skb, QRTR_HDR_SIZE); hdr->version = cpu_to_le32(QRTR_PROTO_VER); - hdr->type = cpu_to_le32(QRTR_TYPE_RESUME_TX); + hdr->type = cpu_to_le32(type); hdr->src_node_id = cpu_to_le32(src_node); hdr->src_port_id = cpu_to_le32(QRTR_PORT_CTRL); hdr->confirm_rx = cpu_to_le32(0); @@ -269,6 +266,22 @@ static struct sk_buff *qrtr_alloc_resume_tx(u32 src_node, hdr->dst_node_id = cpu_to_le32(dst_node); hdr->dst_port_id = cpu_to_le32(QRTR_PORT_CTRL); + return skb; +} + +/* Allocate and construct a resume-tx packet. */ +static struct sk_buff *qrtr_alloc_resume_tx(u32 src_node, + u32 dst_node, u32 port) +{ + const int pkt_len = 20; + struct sk_buff *skb; + __le32 *buf; + + skb = qrtr_alloc_ctrl_packet(QRTR_TYPE_RESUME_TX, pkt_len, + src_node, dst_node); + if (!skb) + return NULL; + buf = (__le32 *)skb_put(skb, pkt_len); memset(buf, 0, pkt_len); buf[0] = cpu_to_le32(QRTR_TYPE_RESUME_TX);