From owner-freebsd-bugs@FreeBSD.ORG  Sat Mar 13 10:47:44 2004
Return-Path: <owner-freebsd-bugs@FreeBSD.ORG>
Delivered-To: freebsd-bugs@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 680)
	id 7925316A4CF; Sat, 13 Mar 2004 10:47:44 -0800 (PST)
To: atapiador@dit.upm.es
Message-Id: <20040313184744.7925316A4CF@hub.freebsd.org>
Date: Sat, 13 Mar 2004 10:47:44 -0800 (PST)
From: darrenr@FreeBSD.ORG (Darren Reed)
cc: freebsd-bugs@FreeBSD.org
Subject: Re: kern/64167
X-BeenThere: freebsd-bugs@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Bug reports <freebsd-bugs.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-bugs>
List-Post: <mailto:freebsd-bugs@freebsd.org>
List-Help: <mailto:freebsd-bugs-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-bugs>,
	<mailto:freebsd-bugs-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 13 Mar 2004 18:47:44 -0000


Does this patch look right ?

Index: ip_fil.c
===================================================================
RCS file: /home/ncvs/src/sys/contrib/ipfilter/netinet/ip_fil.c,v
retrieving revision 1.43
diff -c -r1.43 ip_fil.c
*** ip_fil.c	21 Feb 2004 21:10:39 -0000	1.43
--- ip_fil.c	13 Mar 2004 18:43:58 -0000
***************
*** 2020,2030 ****
  		error = ip6_getpmtu(ro_pmtu, ro, ifp, &finaldst, &mtu);
  		if (error == 0) {
  #else
! #ifdef ND_IFINFO
  			mtu = ND_IFINFO(ifp)->linkmtu;
! #else
  			mtu = nd_ifinfo[ifp->if_index].linkmtu;
! #endif
  #endif
  			if (m0->m_pkthdr.len <= mtu)
  				error = nd6_output(ifp, fin->fin_ifp, m0,
--- 2020,2034 ----
  		error = ip6_getpmtu(ro_pmtu, ro, ifp, &finaldst, &mtu);
  		if (error == 0) {
  #else
! # ifdef IN6_LINKMTU
! 			mtu = IN6_LINKMTU(ifp);
! # else
! #  ifdef ND_IFINFO
  			mtu = ND_IFINFO(ifp)->linkmtu;
! #  else
  			mtu = nd_ifinfo[ifp->if_index].linkmtu;
! #  endif
! # endif
  #endif
  			if (m0->m_pkthdr.len <= mtu)
  				error = nd6_output(ifp, fin->fin_ifp, m0,