Commit ebd4687a authored by Jean Sacren's avatar Jean Sacren Committed by David S. Miller
Browse files

xfrm: simplify the exit path of xfrm_output_one() 



Clean up unnecessary assignment and jump. While there, fix up the label
name.

Signed-off-by: default avatarJean Sacren <sakiwit@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d75afe2

net/xfrm/xfrm_output.c

+4 −5
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err) 


		err = x->type->output(x, skb);

		if (err == -EINPROGRESS)

			goto out_exit;

			goto out;



resume:

		if (err) {
@@ -107,15 +107,14 @@ static int xfrm_output_one(struct sk_buff *skb, int err) 
		x = dst->xfrm;

	} while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL));



	err = 0;

	return 0;



out_exit:

	return err;

error:

	spin_unlock_bh(&x->lock);

error_nolock:

	kfree_skb(skb);

	goto out_exit;

out:

	return err;

}



int xfrm_output_resume(struct sk_buff *skb, int err)