On Thu, 29 Jan 2026 21:45:33 +0100,
Jan Klemkow <jan@openbsd.org> wrote:
> 
> On Thu, Jan 29, 2026 at 04:00:48PM +0100, Janne Johansson wrote:
> > This is an update for the diff I sent when Jan Klemkow first sent out
> > the proposal for SoftLRO last year for certain interfaces.
> > It still gives me large speedups (*)  for incoming TCP and I have been
> > running it for a long while.
> > 
> > In case gmail as usual mangles the whitespaces, the diff is also available here:
> > 
> > https://s3.sto3.safedc.net/jj-public-files/cnmac.softlro.diff
> 
> Thanks for the diff, but...
> 
> Patching file dev/if_cnmac.c using Plan A...
> Hunk #1 succeeded at 55.
> Hunk #2 failed at 109.
> Hunk #3 failed at 310.
> Hunk #4 failed at 318.
> Hunk #5 failed at 1251.
> 4 out of 5 hunks failed--saving rejects to dev/if_cnmac.c.rej
> Hmm...  Ignoring the trailing garbage.
> done
> 
> Even the downloaded version does not apply to cvs HEAD because of
> missing tabs.
> 

Hm, it applies as:

octeon $ patch < /tmp/cnmac.softlro.diff     
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: dev/if_cnmac.c
|===================================================================
|RCS file: /cvs/src/sys/arch/octeon/dev/if_cnmac.c,v
|diff -u -p -u -r1.86 if_cnmac.c
|--- dev/if_cnmac.c     20 May 2024 23:13:33 -0000      1.86
|+++ dev/if_cnmac.c     29 Jan 2026 14:35:19 -0000
--------------------------
Patching file dev/if_cnmac.c using Plan A...
Hunk #1 succeeded at 55.
Hunk #2 succeeded at 109.
Hunk #3 succeeded at 310.
Hunk #4 succeeded at 318.
Hunk #5 succeeded at 1251.
done
octeon $

on if_cnmac.c,v 1.86

-- 
wbr, Kirill