From owner-freebsd-dtrace@FreeBSD.ORG Thu Aug 22 22:30:51 2013 Return-Path: Delivered-To: freebsd-dtrace@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id BF6E1DA7; Thu, 22 Aug 2013 22:30:51 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-wg0-x22d.google.com (mail-wg0-x22d.google.com [IPv6:2a00:1450:400c:c00::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 05C88297E; Thu, 22 Aug 2013 22:30:50 +0000 (UTC) Received: by mail-wg0-f45.google.com with SMTP id n12so2166293wgh.0 for ; Thu, 22 Aug 2013 15:30:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=ksNU0nMbfSv3FXiWYW8m9I5OV3c2lnXHlGLbVVT0Bok=; b=w97aiukrJQDnpfcwqefco4hq/j+S/ouDAE3ZMYtCqFFPZ7Xtb2i8eAkLakvHuOxqzp 6zpUNS+7ROLSH5tSNpEvOxXo0iOH/5SFV9DjElMFw+9NzARzxQ19WcbCVu/Emog1vy7Q Kma/TQ5+G87oG3U+beIje+DbizmvFz6SjeFJmZIhQrzedNGypHYfFkGfxIFxKO4pag/w 95BZ5Z93gJ17drRZ5hGBeRxWd659tC/0+jbqnX++mpKqg5ai54xc+VCt+Pnb9bG6pxUs Nqwa/pEldaTYeDC7xu2M7d/LCn3kPm2Xr7JhHk9zMLEgJcd5fa2CpMJ/wAZ8IE2cDvLG GO1g== MIME-Version: 1.0 X-Received: by 10.180.102.234 with SMTP id fr10mr1146350wib.6.1377210649369; Thu, 22 Aug 2013 15:30:49 -0700 (PDT) Sender: markjdb@gmail.com Received: by 10.194.36.200 with HTTP; Thu, 22 Aug 2013 15:30:49 -0700 (PDT) In-Reply-To: <52168B0E.1050308@rawbw.com> References: <20130821045926.GA17196@raichu> <52168B0E.1050308@rawbw.com> Date: Thu, 22 Aug 2013 18:30:49 -0400 X-Google-Sender-Auth: -L7QkDw5DvR_yhvbLz9bnfh6CRk Message-ID: Subject: Re: DTrace network providers From: Mark Johnston To: Yuri Content-Type: text/plain; charset=ISO-8859-1 X-Content-Filtered-By: Mailman/MimeDel 2.1.14 Cc: freebsd-net@freebsd.org, freebsd-dtrace@freebsd.org X-BeenThere: freebsd-dtrace@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "A discussion list for developers working on DTrace in FreeBSD." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Aug 2013 22:30:51 -0000 On Thu, Aug 22, 2013 at 6:05 PM, Yuri 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 >> >> 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: > >