Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3524748pxf; Mon, 15 Mar 2021 11:29:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxb9tCcDO7d+dCKN/Ng+ipIUpY7+34CoiU0Ytg4I8MgUFC3NGE1Q+1EumDyseljaDhUf4dE X-Received: by 2002:a17:907:72d5:: with SMTP id du21mr25916137ejc.167.1615832947243; Mon, 15 Mar 2021 11:29:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1615832947; cv=none; d=google.com; s=arc-20160816; b=PLaERh77yBq7NBrqd3eMyesVPwIsx4MsDpSWMfptNyRDN+y1ZbOqN8rvmayC+T2NyU 23mq2M5yn0JhgN4i/l9YHX5cL+fXVa4GHCzkvYaIH9zWVDzE9rTXggzVL3e9bp+yWl9/ p27Sh2rsooPT26HwvRdgoP5Omzm+EEnwYPbBa/vfJmiG9FNS2mdPnF2jOdSuSOYmFYHR ZGWpSHJenpxt/+2edPJjYa3db7EHzn6jeJhliLEKSn33LZdOohpMbuBpxzt4dvy6Xh0P xbStFpmHI/iMcCpsrbFfm3KlLFo60D/eOZ1/g2Y5ZxDQJIOWrmYRmTAAX94jTJR+xYOf /vSg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Mz54UwacKVfM3VrlwIvVyBk5v6wuWamogLB7qMVVs7A=; b=N77NPrwJwnDkZBY7gU8tCb7L+bAAX1ooIFR+mZZWqJ/n+kzjmVgh/SWSO5aG8rca8Z 2zYC+b2LmIMEouv1wRVy71eHRLGPmGP1/FegoFWJNRldjbgTIUHh7OjfOyx8/RjekEf6 6esnm3vaYCNgpBHbcOBdGo9r2ZDjLo6qKapA47OgWcHcOtWOouWzYrWv2oD/Fr3fmCd8 BfEAGT29dYfLsrregNISxYvPIlOc+NPl+uElImUJpfw0oWV+vI9QKTriRJgz0mpMvmN5 BSFB4LFeeCUfM1pdmBrjQT57H0H/HizBLba2MpjM9W6jRpuLY090KtCgxLTHQ/wO7f05 GWhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="ZQMnGx/r"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e7si8450893edk.222.2021.03.15.11.28.40; Mon, 15 Mar 2021 11:29:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=@linuxfoundation.org header.s=korg header.b="ZQMnGx/r"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235192AbhCOO3q (ORCPT + 99 others); Mon, 15 Mar 2021 10:29:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:37612 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232957AbhCOOAW (ORCPT ); Mon, 15 Mar 2021 10:00:22 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 17D4C64F66; Mon, 15 Mar 2021 14:00:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1615816805; bh=OlOpvOU5GIyrAwrw0RBzVM1WlqGG14kk1BefBGU9pzM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZQMnGx/rXikM1c1+1LrJEAkE7glZ1DrvMqSAHJbcYorMgJplYHzCcP+6do03BAR6G DLkgzw0tkVaX2KA9RkLIBIEd+BK77fyk/1oP9PA4o+d0YzBkIpZl+DETo/NoMi0OsS +cGtIzz1ISzusK2P1lQGl9XQNq5H+QTaPfYJ1bFg= From: gregkh@linuxfoundation.org To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Per Forlin , Oleksij Rempel , Vladimir Oltean , Florian Fainelli , Jakub Kicinski , Sasha Levin Subject: [PATCH 5.10 124/290] net: dsa: tag_ar9331: let DSA core deal with TX reallocation Date: Mon, 15 Mar 2021 14:53:37 +0100 Message-Id: <20210315135546.108648395@linuxfoundation.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210315135541.921894249@linuxfoundation.org> References: <20210315135541.921894249@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Greg Kroah-Hartman From: Vladimir Oltean [ Upstream commit 86c4ad9a7876777c12fd5a7010152e4141fcb94d ] Now that we have a central TX reallocation procedure that accounts for the tagger's needed headroom in a generic way, we can remove the skb_cow_head call. Cc: Per Forlin Cc: Oleksij Rempel Signed-off-by: Vladimir Oltean Tested-by: Oleksij Rempel Reviewed-by: Florian Fainelli Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/dsa/tag_ar9331.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/net/dsa/tag_ar9331.c b/net/dsa/tag_ar9331.c index 55b00694cdba..002cf7f952e2 100644 --- a/net/dsa/tag_ar9331.c +++ b/net/dsa/tag_ar9331.c @@ -31,9 +31,6 @@ static struct sk_buff *ar9331_tag_xmit(struct sk_buff *skb, __le16 *phdr; u16 hdr; - if (skb_cow_head(skb, AR9331_HDR_LEN) < 0) - return NULL; - phdr = skb_push(skb, AR9331_HDR_LEN); hdr = FIELD_PREP(AR9331_HDR_VERSION_MASK, AR9331_HDR_VERSION); -- 2.30.1