diff options
Diffstat (limited to 'net/xfrm')
-rw-r--r-- | net/xfrm/xfrm_output.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 0cf003dfa8fc..eb4a84288648 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c | |||
@@ -89,7 +89,7 @@ static int xfrm_output_one(struct sk_buff *skb, int err) | |||
89 | 89 | ||
90 | err = x->type->output(x, skb); | 90 | err = x->type->output(x, skb); |
91 | if (err == -EINPROGRESS) | 91 | if (err == -EINPROGRESS) |
92 | goto out_exit; | 92 | goto out; |
93 | 93 | ||
94 | resume: | 94 | resume: |
95 | if (err) { | 95 | if (err) { |
@@ -107,15 +107,14 @@ resume: | |||
107 | x = dst->xfrm; | 107 | x = dst->xfrm; |
108 | } while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL)); | 108 | } while (x && !(x->outer_mode->flags & XFRM_MODE_FLAG_TUNNEL)); |
109 | 109 | ||
110 | err = 0; | 110 | return 0; |
111 | 111 | ||
112 | out_exit: | ||
113 | return err; | ||
114 | error: | 112 | error: |
115 | spin_unlock_bh(&x->lock); | 113 | spin_unlock_bh(&x->lock); |
116 | error_nolock: | 114 | error_nolock: |
117 | kfree_skb(skb); | 115 | kfree_skb(skb); |
118 | goto out_exit; | 116 | out: |
117 | return err; | ||
119 | } | 118 | } |
120 | 119 | ||
121 | int xfrm_output_resume(struct sk_buff *skb, int err) | 120 | int xfrm_output_resume(struct sk_buff *skb, int err) |