From patchwork Wed Jul 15 16:40:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 235608 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp29775ilg; Wed, 15 Jul 2020 09:40:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyl7jbmxu9afXeNXWxy8cDT7TdSUEAKROLnRfjrCrTMvap42Ca2XJcP2mv+1XKoahuvL0ol X-Received: by 2002:a17:906:50a:: with SMTP id j10mr9735107eja.113.1594831230809; Wed, 15 Jul 2020 09:40:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1594831230; cv=none; d=google.com; s=arc-20160816; b=pLMKVYCOuIYDKqiqCCzLek4ULkGC+23OeIOWOOz9A1SV9pe7YQYuhoe6J0iFsXB+Sp NxfsfFPY+pnMMjiCDHfUW/ybATrWi5N8eqOpzeVMb00M3mQecb9fqhUDcUN3o1RDeTSG 2lWZBMeknFfk2/nJCqlowFo3wu0fMNAqGLwloTvVfOX73fnNBdwpQo9WxiTmFFRAPuIw RIFovADLeRz3PFBfmXJ8x4EoqBMgjmATQ5lmr3uJy30UYoF00glRBDOCbMTatL3ga6+X I7QU/EhzBk1VIbzdV76m5lV3n1Kd4ZAOXT8A+G0uvlrtvhGls9apvn3hLKaSQtPJ6lFS tBeQ== 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=XMzq7561T5RJCzslEP/YdFioyB6s0Mb3+VrTCfsQ4JQ=; b=JYwGBaKPgCcfCek7kC1VXBtBZTmMtup3UwJm/4a6uwG0hkXODdssNKDFVwr67yhflM Y6xj5/Yym8IEBF+42532XMfEPXShh6Fyyp4aagxnlpLkHHCoKhp8i7wHXEH8rNsfKGTH roFz9RXrUsT5JCHDyAkO6U9/xxK+EJyKvvM5GME2Da+rhQtfIjDdJtjLeBKZ5q/T0kJz 7t1W3wygvZyqCPq4dnRopyjWNg5EewW2FP0DhoWkHh7imYF7XGjVFKAVGbpkXhDsf0ip aW9mekbNJ9c8nflESDSba9sWX2D+e5V/JtIuHyBSNx2Ii+vpOGz7VO9P94kCRwfhhgJM VQmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=NtioENTc; 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 e23si1537184edy.264.2020.07.15.09.40.30; Wed, 15 Jul 2020 09:40:30 -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=NtioENTc; 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 S1726846AbgGOQk3 (ORCPT + 9 others); Wed, 15 Jul 2020 12:40:29 -0400 Received: from fllv0016.ext.ti.com ([198.47.19.142]:43492 "EHLO fllv0016.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725832AbgGOQk1 (ORCPT ); Wed, 15 Jul 2020 12:40:27 -0400 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0016.ext.ti.com (8.15.2/8.15.2) with ESMTP id 06FGeKb7021727; Wed, 15 Jul 2020 11:40:20 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1594831220; bh=XMzq7561T5RJCzslEP/YdFioyB6s0Mb3+VrTCfsQ4JQ=; h=From:To:Subject:Date:In-Reply-To:References; b=NtioENTc8+mTEg1owiNn5sqHQ843hk2+1KJ3bGXS8oh4j2xDrjjf+mvkYAikT2XcV Yb46xuRguPOyVwtHDz5+Vkcb/PkQrz9WoF56tA69f32+5VD/ZC0UTBW0zShlbMZ0BD ZsbSvWAnkLlZQxFvNPq4s1uaeDSHGMOnKwyoOaGw= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06FGeKQf031815; Wed, 15 Jul 2020 11:40:20 -0500 Received: from DLEE109.ent.ti.com (157.170.170.41) by DLEE112.ent.ti.com (157.170.170.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1979.3; Wed, 15 Jul 2020 11:40:20 -0500 Received: from fllv0040.itg.ti.com (10.64.41.20) 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 via Frontend Transport; Wed, 15 Jul 2020 11:40:20 -0500 Received: from uda0868495.fios-router.home (ileax41-snat.itg.ti.com [10.172.224.153]) by fllv0040.itg.ti.com (8.15.2/8.15.2) with ESMTP id 06FGeCvc081717; Wed, 15 Jul 2020 11:40:19 -0500 From: Murali Karicheri To: , , , , , , , Subject: [net-next PATCH v2 4/9] net: hsr: introduce common code for skb initialization Date: Wed, 15 Jul 2020 12:40:05 -0400 Message-ID: <20200715164012.1222-5-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200715164012.1222-1-m-karicheri2@ti.com> References: <20200715164012.1222-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 ddc6582a89be..b1effa8b2403 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 sk_buff *skb; + struct hsr_tag *hsr_tag; + struct hsr_sup_tag *hsr_stag; + struct hsr_sup_payload *hsr_sp; + unsigned long irqflags; + + 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