From: Vladimir Oltean <vladimir.oltean@nxp.com>
To: netdev@vger.kernel.org
Cc: andrew@lunn.ch, f.fainelli@gmail.com, vivien.didelot@gmail.com,
kuba@kernel.org, Christian Eggers <ceggers@arri.de>,
Kurt Kanzenbach <kurt@linutronix.de>
Subject: [RFC PATCH 09/13] net: dsa: tag_edsa: let DSA core deal with TX reallocation
Date: Sun, 18 Oct 2020 00:36:07 +0300 [thread overview]
Message-ID: <20201017213611.2557565-10-vladimir.oltean@nxp.com> (raw)
In-Reply-To: <20201017213611.2557565-1-vladimir.oltean@nxp.com>
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.
Note that the VLAN code path needs a smaller extra headroom than the
regular EtherType DSA path. That isn't a problem, because this tagger
declares the larger tag length (8 bytes vs 4) as the protocol overhead,
so we are covered in both cases.
Cc: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Vladimir Oltean <vladimir.oltean@nxp.com>
---
net/dsa/tag_edsa.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net/dsa/tag_edsa.c b/net/dsa/tag_edsa.c
index 120614240319..abf70a29deb4 100644
--- a/net/dsa/tag_edsa.c
+++ b/net/dsa/tag_edsa.c
@@ -35,8 +35,6 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev)
* current ethertype field if the packet is untagged.
*/
if (skb->protocol == htons(ETH_P_8021Q)) {
- if (skb_cow_head(skb, DSA_HLEN) < 0)
- return NULL;
skb_push(skb, DSA_HLEN);
memmove(skb->data, skb->data + DSA_HLEN, 2 * ETH_ALEN);
@@ -60,8 +58,6 @@ static struct sk_buff *edsa_xmit(struct sk_buff *skb, struct net_device *dev)
edsa_header[6] &= ~0x10;
}
} else {
- if (skb_cow_head(skb, EDSA_HLEN) < 0)
- return NULL;
skb_push(skb, EDSA_HLEN);
memmove(skb->data, skb->data + EDSA_HLEN, 2 * ETH_ALEN);
--
2.25.1
next prev parent reply other threads:[~2020-10-17 21:36 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-17 21:35 [RFC PATCH 00/13] Generic TX reallocation for DSA Vladimir Oltean
2020-10-17 21:35 ` [RFC PATCH 01/13] net: dsa: add plumbing for custom netdev statistics Vladimir Oltean
2020-10-17 22:13 ` Florian Fainelli
2020-10-17 23:15 ` Andrew Lunn
2020-10-18 0:23 ` Vladimir Oltean
2020-10-18 12:02 ` Heiner Kallweit
2020-10-18 12:16 ` Vladimir Oltean
2020-10-18 13:09 ` Heiner Kallweit
2020-10-18 13:48 ` Vladimir Oltean
2020-10-18 14:13 ` Heiner Kallweit
2020-10-18 22:58 ` Vladimir Oltean
2020-10-18 23:11 ` Florian Fainelli
2020-10-19 0:21 ` Vladimir Oltean
2020-10-19 3:49 ` Florian Fainelli
2020-10-19 12:05 ` Andrew Lunn
2020-10-19 16:27 ` Florian Fainelli
2020-10-18 16:49 ` Jakub Kicinski
2020-10-18 17:36 ` Andrew Lunn
2020-10-18 18:26 ` Jakub Kicinski
2020-10-18 18:33 ` Jakub Kicinski
2020-10-17 21:36 ` [RFC PATCH 02/13] net: dsa: implement a central TX reallocation procedure Vladimir Oltean
2020-10-17 22:01 ` Vladimir Oltean
2020-10-17 22:11 ` Florian Fainelli
2020-10-17 22:17 ` Vladimir Oltean
2020-10-18 0:37 ` Florian Fainelli
2020-10-19 8:33 ` David Laight
2020-10-19 10:30 ` Vladimir Oltean
2020-10-19 11:14 ` David Laight
2020-10-19 11:41 ` Vladimir Oltean
2020-10-19 12:19 ` Andrew Lunn
2020-10-17 22:31 ` Vladimir Oltean
2020-10-18 0:13 ` Vladimir Oltean
2020-10-18 10:36 ` Christian Eggers
2020-10-18 11:42 ` Vladimir Oltean
2020-10-18 11:59 ` Christian Eggers
2020-10-18 12:15 ` Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 03/13] net: dsa: tag_ksz: don't allocate additional memory for padding/tagging Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 04/13] net: dsa: trailer: " Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 05/13] net: dsa: tag_qca: let DSA core deal with TX reallocation Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 06/13] net: dsa: tag_ocelot: " Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 07/13] net: dsa: tag_mtk: " Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 08/13] net: dsa: tag_lan9303: " Vladimir Oltean
2020-10-17 21:36 ` Vladimir Oltean [this message]
2020-10-17 21:36 ` [RFC PATCH 10/13] net: dsa: tag_brcm: " Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 11/13] net: dsa: tag_dsa: " Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 12/13] net: dsa: tag_gswip: " Vladimir Oltean
2020-10-17 22:19 ` Vladimir Oltean
2020-10-17 21:36 ` [RFC PATCH 13/13] net: dsa: tag_ar9331: " Vladimir Oltean
2020-10-17 23:07 ` [RFC PATCH 00/13] Generic TX reallocation for DSA Andrew Lunn
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201017213611.2557565-10-vladimir.oltean@nxp.com \
--to=vladimir.oltean@nxp.com \
--cc=andrew@lunn.ch \
--cc=ceggers@arri.de \
--cc=f.fainelli@gmail.com \
--cc=kuba@kernel.org \
--cc=kurt@linutronix.de \
--cc=netdev@vger.kernel.org \
--cc=vivien.didelot@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).