Subject: Re: Route cache performance tests

From: Simon Kirby <[email-masked]>
Date: Mon, 16 Jun 2003 16:09:22 -0700

On Mon, Jun 16, 2003 at 03:44:01PM -0700, David S. Miller wrote:

> I pushed all of our current work to Linus's tree.
> But for your convenience here are the routing diffs
> against plain 2.5.71

Trying to apply against 2.5.71:

patching file net/ipv4/route.c
Hunk #2 succeeded at 454 (offset -2 lines).
Hunk #3 succeeded at 738 (offset -2 lines).
Hunk #4 succeeded at 775 (offset -2 lines).
patching file net/ipv4/route.c
Hunk #1 FAILED at 739.
1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/route.c.rej

Trying to apply against 2.5.71-bk2:

patching file net/ipv4/route.c
patching file net/ipv4/route.c
Hunk #1 FAILED at 739.
1 out of 1 hunk FAILED -- saving rejects to file net/ipv4/route.c.rej

Missing something between?

Code from bk2:

static int rt_intern_hash(unsigned hash, struct rtable *rt, struct rtable **rp)
{
        struct rtable   *rth, **rthp;
        unsigned long   now = jiffies;
        int attempts = !in_softirq();

Patch:

 static int rt_intern_hash(unsigned hash, struct rtable *rt, struct rtable **rp)
 {
        struct rtable   *rth, **rthp;
-       unsigned long   now = jiffies;
-       struct rtable *cand = NULL, **candp = NULL;
...

Simon-