projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3672387
)
xfrm: remove unnecessary variable in xfrm_output_resume() 2nd try
author
Jean-Christophe DUBOIS
<
[email protected]
>
Wed, 13 Aug 2008 20:35:37 +0000
(13:35 -0700)
committer
David S. Miller
<
[email protected]
>
Wed, 13 Aug 2008 20:35:37 +0000
(13:35 -0700)
Small fix removing an unnecessary intermediate variable.
Signed-off-by: Jean-Christophe DUBOIS <
[email protected]
>
Signed-off-by: David S. Miller <
[email protected]
>
net/xfrm/xfrm_output.c
patch
|
blob
|
history
diff --git
a/net/xfrm/xfrm_output.c
b/net/xfrm/xfrm_output.c
index 3f964db908a71466e77949568d6ea672c63f281c..ac25b4c0e982ee7d5089f7cf5c41d6d73c39ab51 100644
(file)
--- 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,