From patchwork Wed Jul 22 14:40:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 247019 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp595541ilg; Wed, 22 Jul 2020 07:41:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwnts8sYOu+Tx/+NSvS+Mx9yL5xDYbadksr+oeqruT2PYDL3L9tdjdA0aQmiVhIhuj0WXh1 X-Received: by 2002:a17:907:4003:: with SMTP id nj3mr1363871ejb.278.1595428866887; Wed, 22 Jul 2020 07:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595428866; cv=none; d=google.com; s=arc-20160816; b=u3Yh04BjRAH5rdv+MjSS6DNY54yKlRF6RuQDwbVyefSrbWVNL8dv33GcDZbv9m/d0T ekLXMyUlZjYsDSIVGDP5Nc3MLTsVt5yuzFH+/+RPMI43rfMigs+zfll6Bk3HtD/23qyl FoHEliMrYofVj4VRnGtEiDESc48e7LDbUg28feX0ffSvBnJfGEAB/Ny+ina5VueXXR7+ YnwjKQnw37bRFf+GXLF73XBLVdtbjI8pcKnPODFmnw46c9GDjl60ixiMwKrW4IE+zgDB CojiK1efn+htjUnqeSiFKtyCTR/pqrHMdhP2BSk4HBjjYIuLpxjBEFqwKMvnuPG0DD5s bvSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:to:from:dkim-signature; bh=wq/HG2wN64kJj6fb3o9G8/jhw4U/26F2nKCG9d1GLZs=; b=gbSVbxjURmLMZniFxP9Rv2MroZGjRlISRHSBvwek1KYDmeZJsZWfj8f9b105atW99U WDW2v7JqUIU4Ik2AuUXBaWyBZSPqu5tAljkQtOPdTnAwX2T84h40hI7Jn4ZDHrFtxILL gAzUuzYgGJyT7NGDhn8CRUpu+3A2rjmvCbCG7XZmM/x3xihtH/uts7r9Xzii/LEou9zX 75tdSYUguEUqqRPrGyG0KPef0Na/7rjS8c35J5HPCav4fywoBbsk+e61nxzcCnayi+3D 11V0ApR9MOLVmRlN1lr63smRTT4N35Xu90LpwcVR07XfLFmc0dG3Dvm7CajCXSVCT2je U9UA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=slIm3OoQ; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dg12si128669edb.81.2020.07.22.07.41.06; Wed, 22 Jul 2020 07:41:06 -0700 (PDT) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=slIm3OoQ; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=NONE dis=NONE) header.from=ti.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732733AbgGVOk6 (ORCPT + 9 others); Wed, 22 Jul 2020 10:40:58 -0400 Received: from fllv0015.ext.ti.com ([198.47.19.141]:48428 "EHLO fllv0015.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730465AbgGVOk3 (ORCPT ); Wed, 22 Jul 2020 10:40:29 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id 06MEeOX6111100; Wed, 22 Jul 2020 09:40:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1595428824; bh=wq/HG2wN64kJj6fb3o9G8/jhw4U/26F2nKCG9d1GLZs=; h=From:To:Subject:Date:In-Reply-To:References; b=slIm3OoQG9ytAandddYRxuK9jX19T8v9NMZ8lfltu92qu4Xo+b17F64eQPlGfXUo6 TP9QweGnDkbDpGk221Zryo2HswnuBu/zKrMNCLC/rj9h4XTl+i13HVaTNwpjHE2Zye vcbz9dpmumryPgmRmFN0a++if931wqc05t9U6BNQ= Received: from DLEE109.ent.ti.com (dlee109.ent.ti.com [157.170.170.41]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06MEeOmZ112463; Wed, 22 Jul 2020 09:40:24 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE109.ent.ti.com (157.170.170.41) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 22 Jul 2020 09:40:24 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3 via Frontend Transport; Wed, 22 Jul 2020 09:40:23 -0500 Received: from uda0868495.fios-router.home (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0039.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06MEeMLA043940; Wed, 22 Jul 2020 09:40:23 -0500 From: Murali Karicheri To: , , , , , , , Subject: [net-next v5 PATCH 2/7] net: hsr: introduce common code for skb initialization Date: Wed, 22 Jul 2020 10:40:17 -0400 Message-ID: <20200722144022.15746-3-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200722144022.15746-1-m-karicheri2@ti.com> References: <20200722144022.15746-1-m-karicheri2@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org As a preparatory patch to introduce PRP protocol support in the driver, refactor the skb init code to a separate function. Signed-off-by: Murali Karicheri --- net/hsr/hsr_device.c | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) -- 2.17.1 diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index 40ac45123a62..bfe2d1449dbd 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -230,15 +230,11 @@ static const struct header_ops hsr_header_ops = { .parse = eth_header_parse, }; -static void send_hsr_supervision_frame(struct hsr_port *master, - u8 type, u8 hsr_ver) +static struct sk_buff *hsr_init_skb(struct hsr_port *master, u8 hsr_ver) { + struct hsr_priv *hsr = master->hsr; struct sk_buff *skb; int hlen, tlen; - struct hsr_tag *hsr_tag; - struct hsr_sup_tag *hsr_stag; - struct hsr_sup_payload *hsr_sp; - unsigned long irqflags; hlen = LL_RESERVED_SPACE(master->dev); tlen = master->dev->needed_tailroom; @@ -247,22 +243,44 @@ static void send_hsr_supervision_frame(struct hsr_port *master, sizeof(struct hsr_sup_payload) + hlen + tlen); if (!skb) - return; + return skb; skb_reserve(skb, hlen); - skb->dev = master->dev; skb->protocol = htons(hsr_ver ? ETH_P_HSR : ETH_P_PRP); skb->priority = TC_PRIO_CONTROL; if (dev_hard_header(skb, skb->dev, (hsr_ver ? ETH_P_HSR : ETH_P_PRP), - master->hsr->sup_multicast_addr, + hsr->sup_multicast_addr, skb->dev->dev_addr, skb->len) <= 0) goto out; + skb_reset_mac_header(skb); skb_reset_network_header(skb); skb_reset_transport_header(skb); + return skb; +out: + kfree_skb(skb); + + return NULL; +} + +static void send_hsr_supervision_frame(struct hsr_port *master, + u8 type, u8 hsr_ver) +{ + struct hsr_sup_payload *hsr_sp; + struct hsr_sup_tag *hsr_stag; + struct hsr_tag *hsr_tag; + unsigned long irqflags; + struct sk_buff *skb; + + skb = hsr_init_skb(master, hsr_ver); + if (!skb) { + WARN_ONCE(1, "HSR: Could not send supervision frame\n"); + return; + } + if (hsr_ver > 0) { hsr_tag = skb_put(skb, sizeof(struct hsr_tag)); hsr_tag->encap_proto = htons(ETH_P_PRP); @@ -299,11 +317,8 @@ static void send_hsr_supervision_frame(struct hsr_port *master, return; hsr_forward_skb(skb, master); - return; -out: - WARN_ONCE(1, "HSR: Could not send supervision frame\n"); - kfree_skb(skb); + return; } /* Announce (supervision frame) timer function