From patchwork Mon Jul 20 16:57:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Murali Karicheri X-Patchwork-Id: 237564 Delivered-To: patch@linaro.org Received: by 2002:a92:d244:0:0:0:0:0 with SMTP id v4csp2152954ilg; Mon, 20 Jul 2020 09:58:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwNNevupgIaMXkCsD/8LFyq0zY9Kh60s/LbgO7A6HlJx/s0KrhbHYKp2i9ClDO+Y5yUd0aj X-Received: by 2002:a05:6402:796:: with SMTP id d22mr23064815edy.78.1595264294715; Mon, 20 Jul 2020 09:58:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1595264294; cv=none; d=google.com; s=arc-20160816; b=v2F4kN/92MBK6J8ooh/ZOHuRvMe6nPiHB6dcEGMJU2xeZTOasFDH+1/a0abE6nxamE 2vIp7qqAgYnaS6pbZj5hq5JyQ95UZ8iFZBf9Bp/SZI9VumnW53lsIDeTa6Ma0OhvuaTD NaU1PYtlPKjQOb3uYhmdRa2VAdnkpflhbvn0sWIDGkgLfSYIBQQq3s50Yk7WOaimAJMR MkpFdfed9WtOhDFt4d6X5WW1ZAasqeRpaX65eGnG2d9mHp9DoA6sWCT45S6NUkEkoG+q X3xOS0Qv3IJsCR2/91F2ErS5nivBWEIyFTsQZ2JnyFragsmaoHZZZcMjcVKfvizbiWfT YzwA== 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=qADA3EZ/siybzrAO6XVfPEkStJUHLHhr7pzQDJc7fVdz6smvTwASDb9iEcHFJ897w/ Knx8nCVElZW8PL2IWOG5EDRQkqHBcbs06oL9bD5T43vxjLWfqijVbJ4c+//VJSzK9G0e 8IPrZItwrkEDrYGut5CB+BCj1OPafr82SzGXv6tNPm0ltqgvkZ18q6TIxtRM6kLp/39e FC3D5Igypd/pAxZMe1I/7mA98CyWyGOTHZEKqRrMNCQZsImyrgErSbVnIOHcNZNsKkn8 UT/rfbl2Sw7X+3dv9iU3xN3lV/+Og5RSKkdJDFgKK4coeE9iBLYZ6DsbeflsxrBxJ667 xnGQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ti.com header.s=ti-com-17Q1 header.b=pggpCSV+; 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 o5si10583359edj.37.2020.07.20.09.58.14; Mon, 20 Jul 2020 09:58:14 -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=pggpCSV+; 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 S1730538AbgGTQ6L (ORCPT + 9 others); Mon, 20 Jul 2020 12:58:11 -0400 Received: from lelv0143.ext.ti.com ([198.47.23.248]:46868 "EHLO lelv0143.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729941AbgGTQ6K (ORCPT ); Mon, 20 Jul 2020 12:58:10 -0400 Received: from lelv0266.itg.ti.com ([10.180.67.225]) by lelv0143.ext.ti.com (8.15.2/8.15.2) with ESMTP id 06KGw5BF079972; Mon, 20 Jul 2020 11:58:05 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1595264285; bh=wq/HG2wN64kJj6fb3o9G8/jhw4U/26F2nKCG9d1GLZs=; h=From:To:Subject:Date:In-Reply-To:References; b=pggpCSV+jUMiouI1P11dgQ/6W+SNqGMM0+JVl/GY/M4SrGhJYsjI3G3MEe47XE+zk LjBMx8lNIq3m3n1+52uM5FafB4zG95BvpPF5nyTk85iTOg/d7jznm7e9OVqswTCJcO MzFwZC6pbGcHrXkGJvygzWi3j5ZEirrCdpoXRgvo= Received: from DLEE112.ent.ti.com (dlee112.ent.ti.com [157.170.170.23]) by lelv0266.itg.ti.com (8.15.2/8.15.2) with ESMTPS id 06KGw5nr128546 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Mon, 20 Jul 2020 11:58:05 -0500 Received: from DLEE112.ent.ti.com (157.170.170.23) 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; Mon, 20 Jul 2020 11:58:05 -0500 Received: from fllv0039.itg.ti.com (10.64.41.19) 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 via Frontend Transport; Mon, 20 Jul 2020 11:58:05 -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 06KGw3B5041101; Mon, 20 Jul 2020 11:58:04 -0500 From: Murali Karicheri To: , , , , , , , Subject: [net-next v4 PATCH 2/7] net: hsr: introduce common code for skb initialization Date: Mon, 20 Jul 2020 12:57:58 -0400 Message-ID: <20200720165803.17793-3-m-karicheri2@ti.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200720165803.17793-1-m-karicheri2@ti.com> References: <20200720165803.17793-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