Date: Thu, 22 Aug 2013 18:30:49 -0400 From: Mark Johnston <markj@freebsd.org> To: Yuri <yuri@rawbw.com> Cc: freebsd-net@freebsd.org, Mark Johnston <markj@freebsd.org>, freebsd-dtrace@freebsd.org Subject: Re: DTrace network providers Message-ID: <CAMw1wOwsrdOOMuLJPgzaRfiCimrdxti6W%2B1JkWV2uqbW5bb%2BPw@mail.gmail.com> In-Reply-To: <52168B0E.1050308@rawbw.com> References: <20130821045926.GA17196@raichu> <52168B0E.1050308@rawbw.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Thu, Aug 22, 2013 at 6:05 PM, Yuri <yuri@rawbw.com> wrote: > On 08/20/2013 22:00, Mark Johnston wrote: > >> The patch is here: >> >> http://people.freebsd.org/~**markj/patches/network-** >> providers/network-providers-1.**diff<http://people.freebsd.org/~markj/patches/network-providers/network-providers-1.diff>; >> >> It depends on r254468. To use it, just recompile the kernel (assuming >> > > Your patch fails to apply, see below. > > I use clean r254468 as you suggested. > My apologies! It looks like r254523 introduced a conflict. r254468 is a minimum dependency. I'd suggest trying again with r254523 or later. -Mark > Yuri > > -------------------------- > |diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c > |index 0a87e7a..15196e0 100644 > |--- a/sys/netinet/ip_output.c > |+++ b/sys/netinet/ip_output.c > -------------------------- > Patching file a/sys/netinet/ip_output.c using Plan A... > Hunk #1 succeeded at 34. > Hunk #2 succeeded at 48. > Hunk #3 succeeded at 66. > Hunk #4 failed at 625. > Hunk #5 succeeded at 660 with fuzz 2. > 1 out of 5 hunks failed--saving rejects to a/sys/netinet/ip_output.c.rej > > -------------------------- > |diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c > |index 7755da1..9eaa0aa 100644 > |--- a/sys/netinet6/nd6.c > |+++ b/sys/netinet6/nd6.c > -------------------------- > Patching file a/sys/netinet6/nd6.c using Plan A... > Hunk #1 succeeded at 34. > Hunk #2 succeeded at 51. > Hunk #3 succeeded at 64. > Hunk #4 failed at 2086. > 1 out of 4 hunks failed--saving rejects to a/sys/netinet6/nd6.c.rej > Hmm... The next patch looks like a unified diff to me... > The text leading up to this was: > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMw1wOwsrdOOMuLJPgzaRfiCimrdxti6W%2B1JkWV2uqbW5bb%2BPw>