From owner-freebsd-current@FreeBSD.ORG Mon Aug 2 10:06:39 2004 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id D32D516A4CE for ; Mon, 2 Aug 2004 10:06:39 +0000 (GMT) Received: from dsl-mail.kamp.net (mail.kamp-dsl.de [195.62.99.42]) by mx1.FreeBSD.org (Postfix) with SMTP id AC29E43D55 for ; Mon, 2 Aug 2004 10:06:38 +0000 (GMT) (envelope-from root@pukruppa.net) Received: (qmail 8113 invoked by uid 513); 2 Aug 2004 10:07:37 -0000 Received: from root@pukruppa.net by dsl-mail by uid 89 with qmail-scanner-1.21 Clear:RC:1(213.146.114.24):SA:0(-4.9/5.0):. Processed in 0.929674 secs); 02 Aug 2004 10:07:37 -0000 X-Spam-Status: No, hits=-4.9 required=5.0 Received: from unknown (HELO reverse-213-146-114-24.dialin.kamp-dsl.de) (213.146.114.24) by dsl-mail.kamp.net with SMTP; 2 Aug 2004 10:07:36 -0000 Date: Mon, 2 Aug 2004 12:06:09 +0000 (GMT) From: Peter Ulrich Kruppa To: "Bjoern A. Zeeb" In-Reply-To: Message-ID: <20040802120348.B127@pukruppa.net> References: <20040730091525.U484@pukruppa.net> <20040731213854.GB38076@cell.sick.ru> <410CB1E4.2030103@mcsi.pp.ru> <20040801093316.GA40608@cell.sick.ru> <410CBBA9.1080302@mcsi.pp.ru> <20040801095558.GA40732@cell.sick.ru> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII cc: Maxim Maximov cc: Gleb Smirnoff cc: freebsd-current@freebsd.org Subject: Re: PPP(was: oE) problems with latest -CURRENT X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Aug 2004 10:06:40 -0000 Thanks, for repairing things. Your patch works fine for me. Will it be committed soon, or do I have to keep it? Peter Ulrich Kruppa ("Original poster") On Sun, 1 Aug 2004, Bjoern A. Zeeb wrote: > > Index: ng_pppoe.c > =================================================================== > RCS file: /local/mirror/FreeBSD/r/ncvs/src/sys/netgraph/ng_pppoe.c,v > retrieving revision 1.66 > diff -u -p -r1.66 ng_pppoe.c > --- ng_pppoe.c 27 Jul 2004 19:47:13 -0000 1.66 > +++ ng_pppoe.c 1 Aug 2004 14:17:49 -0000 > @@ -246,9 +246,9 @@ enum { > }; > > struct ng_pppoe_mode_t { > - u_int8_t id; > + u_int8_t id; > const struct ether_header *eh_prototype; > - const char *name; > + const char *name; > }; > > static const struct ether_header eh_standard = > @@ -283,10 +283,9 @@ struct PPPOE { > typedef struct PPPOE *priv_p; > > /* Deprecated sysctl, leaved here to keep compatibility for some time */ > -#define PPPOE_KEEPSTANDARD -1 > -#define PPPOE_STANDARD 0 > -#define PPPOE_NONSTANDARD 1 > -static int pppoe_mode = PPPOE_KEEPSTANDARD; > +#define PPPOE_SYSCTL_KEEPSTANDARD -1 > +#define PPPOE_SYSCTL_STANDARD 0 > +#define PPPOE_SYSCTL_NONSTANDARD 1 > static const struct ng_pppoe_mode_t *sysctl_mode = ng_pppoe_modes; > > static int > @@ -295,23 +294,22 @@ ngpppoe_set_ethertype(SYSCTL_HANDLER_ARG > int error; > int val; > > - val = pppoe_mode; > + val = PPPOE_SYSCTL_KEEPSTANDARD; > error = sysctl_handle_int(oidp, &val, sizeof(int), req); > if (error != 0 || req->newptr == NULL) > return (error); > switch (val) { > - case PPPOE_NONSTANDARD: > + case PPPOE_SYSCTL_NONSTANDARD: > sysctl_mode = ng_pppoe_modes + 1; > break; > - case PPPOE_STANDARD: > - case PPPOE_KEEPSTANDARD: > + case PPPOE_SYSCTL_STANDARD: > + case PPPOE_SYSCTL_KEEPSTANDARD: > sysctl_mode = ng_pppoe_modes; > break; > default: > return (EINVAL); > } > > - pppoe_mode = val; > printf("net.graph.nonstandard_pppoe is deprecated. See ng_pppoe(4), ppp(8).\n"); > return (0); > } > > -- > Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT > _______________________________________________ > freebsd-current@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" >