From patchwork Wed Jun 7 18:54:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 103307 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp2084132qgd; Wed, 7 Jun 2017 11:55:09 -0700 (PDT) X-Received: by 10.84.128.67 with SMTP id 61mr30151142pla.246.1496861709345; Wed, 07 Jun 2017 11:55:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1496861709; cv=none; d=google.com; s=arc-20160816; b=fcsHqF0Ob0JirnYIsnhxKAKQjBRcVdpYVZraXUBEWPysptcjJjBglkhQ+jdg62vBDv yTBoc3Xf72ouOx3nsJIFf//a0eP00JPrKhKE5225pn+0RgwyPS+KheHDFPdQ8fMSC041 RsbRv5XB0a2+eflX7q8nimsIh9iTxaq5R8nYLsI7v4pt6GKURs4D7slM61OGerjsSb+G 1EshSoLvMgUrnPCBgNcNWLWu/pu6aDSUqHTR7HMlb6IxtYMos1Gzulyl005G/h3q6eP9 KXMRI4nZrjgL+Mcbegpbn4RlcqbSOYDcuShV0NqMyMi8TJn8WcnWJBgsVTi+DX7nEg2i pZGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=anrsNZd9wcjk8ZLJW70RzN1pLiYpwDqb+7OdNn/wDZA=; b=zQyG+1pUnik+I8n3GYt71yZedRwWjQfzx60EfCsFNEOZRJLuMu3PDXjXgWVIKIk954 vv26xL2sZa4wivF9bttpzvr1OJJZRAmtFip+Iqmr+Zo65goPbHtUyJrY06VTEWDy4TLO YZiA82qjlBpVX+gtuqAxtWzp89Z0WH3Fyu4xYTc0YjN0Rhozd0WitGcdarq+hRslbm06 qT3pahzwwBBuzPpWwj6kzQjSSkk9ibwcHLVuSJXkjyl7HGnh7vht3vpM6iDbDc9pBbm1 NBS7AeQrQq27eWvu+y3TSxiwsum3iEpX2vK1+A0FInV6H5F6YVVWCaYeZSg/Uhy16+S1 7b+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (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 n127si2436833pga.135.2017.06.07.11.55.08; Wed, 07 Jun 2017 11:55:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-arm-msm-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-arm-msm-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751901AbdFGSzH (ORCPT + 10 others); Wed, 7 Jun 2017 14:55:07 -0400 Received: from mail-pf0-f172.google.com ([209.85.192.172]:36125 "EHLO mail-pf0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751722AbdFGSzG (ORCPT ); Wed, 7 Jun 2017 14:55:06 -0400 Received: by mail-pf0-f172.google.com with SMTP id x63so8642737pff.3 for ; Wed, 07 Jun 2017 11:55:06 -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; bh=ZDli+ju3xukeebpOdUnUQQczHAQ9qeVy1KSorxXQB1Y=; b=jb8YK22x9n2eWIJezyGGXzj9wgu0YVTLke4hSiUzhFA+DrPf9frYwKoWGhVN6KUyAs b0mbNe7/jkUgUZ/8kuK8Rj5DZz153wENnroAA202DRFppCedX32OL0lNikVFi0WVrYPg haWu93TyiIP8cpGGYL7fUZlU4iMtmHgLXhBkU= 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; bh=ZDli+ju3xukeebpOdUnUQQczHAQ9qeVy1KSorxXQB1Y=; b=KIlH1vpFy/Qby6II9sAV+K7Msc1Ac3KDOgS3PMWv1e7K1yT1cu4heCWpSH2bqsv0zx 3bNS1oJ9xlfDgXNW6RegDuqd45ZsNfQNmijn/2GuCfD7cHA6Rkm9YhSR0UCf2/XNaWAT uMguu70bYR1Q8tAmB1Lv7fXitf+66pDCNsxD/a736Iz2xDWDasWo1L2vCU6JinRVmRJA fC/+018y0XdGm990HEt6g66RP6N1nYr9mFado0liN3ztGuPTJprcbhd5OJIDTdUiiuEt kPkuJQDPWofBnsdoL7M+vlRDJM5apya+caJshZWqQ/8zjCUIXNqsEL070rga0RZWFt7a tRjg== X-Gm-Message-State: AODbwcAD4klc+rd0LLfBmBgHzytwneNZnmK7QgX2lQy+HJDH5apFJkvE XkDziMe4iGOYJStx X-Received: by 10.84.134.34 with SMTP id 31mr30286041plg.51.1496861705660; Wed, 07 Jun 2017 11:55:05 -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 u73sm5355149pfi.105.2017.06.07.11.55.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Jun 2017 11:55:04 -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: [PATCH 1/4] net: qrtr: Refactor packet allocation Date: Wed, 7 Jun 2017 11:54:58 -0700 Message-Id: <20170607185501.6000-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.12.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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);