DTrace network providers

Mark Johnston markj at freebsd.org
Thu Aug 22 22:30:51 UTC 2013


On Thu, Aug 22, 2013 at 6:05 PM, Yuri <yuri at 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:
>
>


More information about the freebsd-net mailing list