* [PATCH] remove unnecessary variable in xfrm_output_resume() 2nd try
@ 2008-08-13 18:52 Jean-Christophe Dubois
2008-08-13 20:35 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jean-Christophe Dubois @ 2008-08-13 18:52 UTC (permalink / raw)
To: netdev
Small fix removing an unnecessary intermediate variable.
Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
---
diff -Naur linux-2.6.26.2.org/net/xfrm/xfrm_output.c linux-2.6.26.2/net/xfrm/xfrm_output.c
--- linux-2.6.26.2.org/net/xfrm/xfrm_output.c 2008-08-12 00:37:29.000000000 +0200
+++ linux-2.6.26.2/net/xfrm/xfrm_output.c 2008-08-12 00:40:40.000000000 +0200
@@ -112,16 +112,13 @@
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,
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] remove unnecessary variable in xfrm_output_resume() 2nd try
2008-08-13 18:52 [PATCH] remove unnecessary variable in xfrm_output_resume() 2nd try Jean-Christophe Dubois
@ 2008-08-13 20:35 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2008-08-13 20:35 UTC (permalink / raw)
To: jcd; +Cc: netdev
From: Jean-Christophe Dubois <jcd@tribudubois.net>
Date: Wed, 13 Aug 2008 20:52:55 +0200
> Small fix removing an unnecessary intermediate variable.
>
> Signed-off-by: Jean-Christophe DUBOIS <jcd@tribudubois.net>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-08-13 20:35 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-13 18:52 [PATCH] remove unnecessary variable in xfrm_output_resume() 2nd try Jean-Christophe Dubois
2008-08-13 20:35 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).