| Message ID | 20210722185028.17555-1-l4stpr0gr4m@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | mpls: defer ttl decrement in mpls_forward() | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Fri, 23 Jul 2021 03:50:28 +0900 you wrote: > Defer ttl decrement to optimize in tx_err case. There is no need > to decrease ttl in the case of goto tx_err. > > Signed-off-by: Kangmin Park <l4stpr0gr4m@gmail.com> > --- > net/mpls/af_mpls.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Here is the summary with links: - mpls: defer ttl decrement in mpls_forward() https://git.kernel.org/netdev/net-next/c/6a6b83ca471c You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 05a21dd072df..ffeb2df8be7a 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c @@ -407,7 +407,6 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev, /* Verify ttl is valid */ if (dec.ttl <= 1) goto err; - dec.ttl -= 1; /* Find the output device */ out_dev = rcu_dereference(nh->nh_dev); @@ -431,6 +430,7 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev, skb->dev = out_dev; skb->protocol = htons(ETH_P_MPLS_UC); + dec.ttl -= 1; if (unlikely(!new_header_size && dec.bos)) { /* Penultimate hop popping */ if (!mpls_egress(dev_net(out_dev), rt, skb, dec))
Defer ttl decrement to optimize in tx_err case. There is no need to decrease ttl in the case of goto tx_err. Signed-off-by: Kangmin Park <l4stpr0gr4m@gmail.com> --- net/mpls/af_mpls.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)