| Message ID | 20230724033058.16795-1-ansuelsmth@gmail.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net-next,1/3] net: dsa: tag_qca: return early if dev is not found | expand |
On Mon, Jul 24, 2023 at 05:30:56AM +0200, Christian Marangi wrote: > Currently checksum is recalculated and dsa tag stripped even if we later > don't find the dev. > > To improve code, exit early if we don't find the dev and skip additional > operation on the skb since it will be freed anyway. > > Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> Reviewed-by: Simon Horman <simon.horman@corigine.com>
On Mon, Jul 24, 2023 at 05:30:56AM +0200, Christian Marangi wrote: > Currently checksum is recalculated and dsa tag stripped even if we later > don't find the dev. > > To improve code, exit early if we don't find the dev and skip additional > operation on the skb since it will be freed anyway. > > Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> > --- Reviewed-by: Vladimir Oltean <olteanv@gmail.com>
On 7/23/23 20:30, Christian Marangi wrote: > Currently checksum is recalculated and dsa tag stripped even if we later > don't find the dev. > > To improve code, exit early if we don't find the dev and skip additional > operation on the skb since it will be freed anyway. > > Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com>
diff --git a/net/dsa/tag_qca.c b/net/dsa/tag_qca.c index e757c8de06f1..e5ff7c34e577 100644 --- a/net/dsa/tag_qca.c +++ b/net/dsa/tag_qca.c @@ -75,10 +75,6 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) return NULL; } - /* Remove QCA tag and recalculate checksum */ - skb_pull_rcsum(skb, QCA_HDR_LEN); - dsa_strip_etype_header(skb, QCA_HDR_LEN); - /* Get source port information */ port = FIELD_GET(QCA_HDR_RECV_SOURCE_PORT, hdr); @@ -86,6 +82,10 @@ static struct sk_buff *qca_tag_rcv(struct sk_buff *skb, struct net_device *dev) if (!skb->dev) return NULL; + /* Remove QCA tag and recalculate checksum */ + skb_pull_rcsum(skb, QCA_HDR_LEN); + dsa_strip_etype_header(skb, QCA_HDR_LEN); + return skb; }
Currently checksum is recalculated and dsa tag stripped even if we later don't find the dev. To improve code, exit early if we don't find the dev and skip additional operation on the skb since it will be freed anyway. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> --- net/dsa/tag_qca.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)