Commit 6a6b83ca authored by Kangmin Park's avatar Kangmin Park Committed by David S. Miller

mpls: defer ttl decrement in mpls_forward()

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: default avatarKangmin Park <l4stpr0gr4m@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8cc236db
...@@ -407,7 +407,6 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev, ...@@ -407,7 +407,6 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev,
/* Verify ttl is valid */ /* Verify ttl is valid */
if (dec.ttl <= 1) if (dec.ttl <= 1)
goto err; goto err;
dec.ttl -= 1;
/* Find the output device */ /* Find the output device */
out_dev = rcu_dereference(nh->nh_dev); out_dev = rcu_dereference(nh->nh_dev);
...@@ -431,6 +430,7 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev, ...@@ -431,6 +430,7 @@ static int mpls_forward(struct sk_buff *skb, struct net_device *dev,
skb->dev = out_dev; skb->dev = out_dev;
skb->protocol = htons(ETH_P_MPLS_UC); skb->protocol = htons(ETH_P_MPLS_UC);
dec.ttl -= 1;
if (unlikely(!new_header_size && dec.bos)) { if (unlikely(!new_header_size && dec.bos)) {
/* Penultimate hop popping */ /* Penultimate hop popping */
if (!mpls_egress(dev_net(out_dev), rt, skb, dec)) if (!mpls_egress(dev_net(out_dev), rt, skb, dec))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment