diff options
| author | Jean-Christophe DUBOIS <jcd@tribudubois.net> | 2008-08-13 13:35:37 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-13 13:35:37 -0700 |
| commit | c1e24df27fb1058739789126db6ad1b1ef719346 (patch) | |
| tree | 57409e48ad8fb506975e1207af63bbd51495575f /net | |
| parent | 36723873b664fb6b5cfe06d291df948126e43f50 (diff) | |
| download | linux-3.10-c1e24df27fb1058739789126db6ad1b1ef719346.tar.gz linux-3.10-c1e24df27fb1058739789126db6ad1b1ef719346.tar.bz2 linux-3.10-c1e24df27fb1058739789126db6ad1b1ef719346.zip | |
xfrm: remove unnecessary variable in xfrm_output_resume() 2nd try
Small fix removing an unnecessary intermediate variable.
Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -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 3f964db908a..ac25b4c0e98 100644 --- a/net/xfrm/xfrm_output.c +++ b/net/xfrm/xfrm_output.c @@ -112,16 +112,13 @@ error_nolock: int xfrm_output_resume(struct sk_buff *skb, int err) { while (likely((err = xfrm_output_one(skb, err)) == 0)) { - struct xfrm_state *x; - nf_reset(skb); err = skb->dst->ops->local_out(skb); if (unlikely(err != 1)) goto out; - x = skb->dst->xfrm; - if (!x) + if (!skb->dst->xfrm) return dst_output(skb); err = nf_hook(skb->dst->ops->family, |