[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20080721.162814.38681521.davem@davemloft.net>
Date: Mon, 21 Jul 2008 16:28:14 -0700 (PDT)
From: David Miller <davem@...emloft.net>
To: shemminger@...tta.com
Cc: netdev@...r.kernel.org
Subject: Re: [PATCH 2/3] netns: timer allocation
From: Stephen Hemminger <shemminger@...tta.com>
Date: Mon, 21 Jul 2008 14:07:51 -0700
> FIB timer list is a trivial size structure, avoid indirection and just
> put it in existing ns.
>
> Signed-off-by: Stephen Hemminger <shemminger@...tta.com>
>
> ---
> Sigh.. part 1 patch was not refreshed.
Sigh, really, 3 times?
+ git apply --check --whitespace=error-all diff
error: patch failed: net/ipv6/ip6_fib.c:661
error: net/ipv6/ip6_fib.c: patch does not apply
Would it kill you to just clone out a fresh net-2.6 tree and actually
try to apply the patch before sending it to me?
You're asking me to do that 3+ times. So you can do it once, right?
:)
> --- a/net/ipv6/ip6_fib.c 2008-07-21 14:06:22.000000000 -0700
> +++ b/net/ipv6/ip6_fib.c 2008-07-21 14:06:32.000000000 -0700
> @@ -661,16 +661,16 @@ static int fib6_add_rt2node(struct fib6_
>
> static __inline__ void fib6_start_gc(struct net *net, struct rt6_info *rt)
> {
> - if (!timer_pending(net->ipv6.ip6_fib_timer) &&
> + if (!timer_pending(&net->ipv6.ip6_fib_timer) &&
> (rt->rt6i_flags & (RTF_EXPIRES|RTF_CACHE)))
> - mod_timer(net->ipv6.ip6_fib_timer, jiffies +
> + mod_timer(&net->ipv6.ip6_fib_timer, jiffies +
> net->ipv6.sysctl.ip6_rt_gc_interval);
> }
>
In net-2.6 those mod_timer() lines read:
mod_timer(net->ipv6.ip6_fib_timer,
jiffies + net->ipv6.sysctl.ip6_rt_gc_interval);
the jiffies starts on the second line, not the first.
Something is seriously wrong with whatever tree you're generating
these patches against.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists