From owner-freebsd-stable@FreeBSD.ORG Sat Jun 5 12:49:55 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 6F63916A4CE for ; Sat, 5 Jun 2004 12:49:55 -0700 (PDT) Received: from harrier.mail.pas.earthlink.net (harrier.mail.pas.earthlink.net [207.217.120.12]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5ACE543D39 for ; Sat, 5 Jun 2004 12:49:55 -0700 (PDT) (envelope-from rpratt1950@earthlink.net) Received: from user89.net1586.fl.sprint-hsd.net ([69.69.238.89] helo=kt.weeble.com) by harrier.mail.pas.earthlink.net with smtp (Exim 3.33 #1) id 1BWhAo-0007jd-00; Sat, 05 Jun 2004 12:49:46 -0700 Date: Sat, 5 Jun 2004 15:50:41 -0400 From: Randy Pratt To: Archie Cobbs Message-Id: <20040605155041.121a83f3.rpratt1950@earthlink.net> In-Reply-To: <200406051747.i55HlCr4001236@arch20m.dellroad.org> References: <20040604232523.A22373@das.ufsc.br> <200406051747.i55HlCr4001236@arch20m.dellroad.org> X-Mailer: Sylpheed version 0.9.11 (GTK+ 1.2.10; i386-portbld-freebsd4.10) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit cc: rro@das.ufsc.br cc: freebsd-stable@FreeBSD.ORG cc: acardenas@bsdperu.org cc: robclark@tds.net 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: Sat, 05 Jun 2004 19:49:55 -0000 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! Thanks for jumping on this. I would have had to find my old dialup modem otherwise! Best regards, Randy > Thanks, > -Archie > > __________________________________________________________________________ > 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; > } > > --