From owner-freebsd-stable@FreeBSD.ORG Sat Jun 5 17:50:58 2004 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9DB4116A4CE for ; Sat, 5 Jun 2004 17:50:58 -0700 (PDT) Received: from vangogh.das.ufsc.br (vangogh.das.ufsc.br [150.162.14.111]) by mx1.FreeBSD.org (Postfix) with ESMTP id 7C7EB43D2F for ; Sat, 5 Jun 2004 17:50:57 -0700 (PDT) (envelope-from rro@das.ufsc.br) Received: from ssh3.das.ufsc.br (ssh3.das.ufsc.br [10.0.0.3]) (DAS-UFSC)) with ESMTP id 10D069F123; Sat, 5 Jun 2004 21:50:56 -0300 (BRT) Received: by ssh3.das.ufsc.br (Postfix, from userid 2398) id ECF0018673; Sat, 5 Jun 2004 21:50:44 -0300 (GMT+3) Date: Sat, 5 Jun 2004 21:50:44 -0300 From: Rafael R Obelheiro To: Randy Pratt Message-ID: <20040605215044.A22634@das.ufsc.br> References: <20040604232523.A22373@das.ufsc.br> <200406051747.i55HlCr4001236@arch20m.dellroad.org> <20040605155041.121a83f3.rpratt1950@earthlink.net> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5.1i In-Reply-To: <20040605155041.121a83f3.rpratt1950@earthlink.net>; from rpratt1950@earthlink.net on Sat, Jun 05, 2004 at 03:50:41PM -0400 cc: robclark@tds.net cc: freebsd-stable@FreeBSD.ORG cc: acardenas@bsdperu.org cc: Archie Cobbs Subject: Re: 4.10-STABLE - ADSL PPPoE X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 06 Jun 2004 00:50:58 -0000 On Sat, Jun 05, 2004 at 03:50:41PM -0400, Randy Pratt wrote: > On Sat, 5 Jun 2004 12:47:12 -0500 (CDT) > Archie Cobbs wrote: > > > > > Edit src/sys/netgraph/ng_ether.c > > > > Add delta 1.2.2.15 2004.06.01.22.55.24 archie > > > > > > This is the culprit. I was having the same problem (PPPoE stopped > > > > Oops, my apologies.. I incorrectly applied the MFC. Please try the > > patch below (apply to the newer version of ng_ether.c) and let me > > know if this makes things work again. > > The patch below works for me! It works for me as well. > Thanks for jumping on this. Indeed, thanks for the quick patch. > I would have had to find my old dialup modem otherwise! Dialup modem? What are you talking about? ;-) Cheers, --rro -- rro at das ufsc br > > __________________________________________________________________________ > > Archie Cobbs * CTO, Awarix * http://www.awarix.com > > > > --- ng_ether.c.orig Sat Jun 5 12:45:04 2004 > > +++ ng_ether.c Sat Jun 5 12:45:35 2004 > > @@ -89,7 +89,7 @@ > > static void ng_ether_detach(struct ifnet *ifp); > > > > /* Other functions */ > > -static void ng_ether_input2(node_p node, > > +static void ng_ether_input2(hook_p hook, > > struct mbuf **mp, struct ether_header *eh); > > static int ng_ether_glueback_header(struct mbuf **mp, > > struct ether_header *eh); > > @@ -203,7 +203,7 @@ > > /* If "lower" hook not connected, let packet continue */ > > if (priv->lower == NULL) > > return; > > - ng_ether_input2(node, mp, eh); > > + ng_ether_input2(priv->lower, mp, eh); > > } > > > > /* > > @@ -224,7 +224,7 @@ > > m_freem(m); > > return; > > } > > - ng_ether_input2(node, &m, eh); > > + ng_ether_input2(priv->orphan, &m, eh); > > if (m != NULL) > > m_freem(m); > > } > > @@ -237,9 +237,9 @@ > > * NOTE: this function will get called at splimp() > > */ > > static void > > -ng_ether_input2(node_p node, struct mbuf **mp, struct ether_header *eh) > > +ng_ether_input2(hook_p hook, struct mbuf **mp, struct ether_header *eh) > > { > > - const priv_p priv = node->private; > > + const priv_p priv = hook->node->private; > > meta_p meta = NULL; > > int error; > > > > @@ -248,7 +248,7 @@ > > return; > > > > /* Send out lower/orphan hook */ > > - (void)ng_queue_data(priv->lower, *mp, meta); > > + (void)ng_queue_data(hook, *mp, meta); > > *mp = NULL; > > } > > > > > > > --