diff options
| -rw-r--r-- | net/xfrm/xfrm_output.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/net/xfrm/xfrm_output.c b/net/xfrm/xfrm_output.c index 3f964db908a7..ac25b4c0e982 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c | |||
| @@ -112,16 +112,13 @@ error_nolock: | |||
| 112 | int xfrm_output_resume(struct sk_buff *skb, int err) | 112 | int xfrm_output_resume(struct sk_buff *skb, int err) |
| 113 | { | 113 | { |
| 114 | while (likely((err = xfrm_output_one(skb, err)) == 0)) { | 114 | while (likely((err = xfrm_output_one(skb, err)) == 0)) { |
| 115 | struct xfrm_state *x; | ||
| 116 | |||
| 117 | nf_reset(skb); | 115 | nf_reset(skb); |
| 118 | 116 | ||
| 119 | err = skb->dst->ops->local_out(skb); | 117 | err = skb->dst->ops->local_out(skb); |
| 120 | if (unlikely(err != 1)) | 118 | if (unlikely(err != 1)) |
| 121 | goto out; | 119 | goto out; |
| 122 | 120 | ||
| 123 | x = skb->dst->xfrm; | 121 | if (!skb->dst->xfrm) |
| 124 | if (!x) | ||
| 125 | return dst_output(skb); | 122 | return dst_output(skb); |
| 126 | 123 | ||
| 127 | err = nf_hook(skb->dst->ops->family, | 124 | err = nf_hook(skb->dst->ops->family, |
