From owner-freebsd-tokenring Sun Mar 19 6:31: 0 2000 Delivered-To: freebsd-tokenring@freebsd.org Received: from heathers.stdio.com (heathers.stdio.com [199.89.192.5]) by hub.freebsd.org (Postfix) with ESMTP id 25DC637B635; Sun, 19 Mar 2000 06:30:52 -0800 (PST) (envelope-from lile@stdio.com) Received: from heathers (heathers [199.89.192.5]) by heathers.stdio.com (8.9.3/8.8.8) with ESMTP id JAA81640; Sun, 19 Mar 2000 09:30:40 -0500 (EST) (envelope-from lile@stdio.com) Date: Sun, 19 Mar 2000 09:30:39 -0500 (EST) From: Larry Lile To: Nikolai Saoukh Cc: lile@FreeBSD.ORG, freebsd-tokenring@FreeBSD.ORG Subject: Re: small typo in new-bus Olicom drover & bit of respect In-Reply-To: <20000319132600.A2368@Draculina.otdel-1.org> Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-tokenring@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG On Sun, 19 Mar 2000, Nikolai Saoukh wrote: > There is small typo (I hope so) in work memory allocation > Shall we respect Olicom and name OC-3540 as '... 100/16/4 ...'? > > --- if_oltr.c.orig Sun Mar 19 13:18:02 2000 > +++ if_oltr.c Sun Mar 19 13:19:28 2000 > @@ -110,5 +110,5 @@ > /* 17 */ "Olicom PCMCIA 16/4 Adapter (OC-3121, OC-3230, OC-3232) [unsupported]", > /* 18 */ "Olicom PCMCIA 16/4 Adapter (OC-3250)", > - /* 19 */ "Olicom RapidFire 3540 4/16/100 Adapter (OC-3540)" > + /* 19 */ "Olicom RapidFire 3540 100/16/4 Adapter (OC-3540)" > }; > @@ -400,5 +400,5 @@ > > if (work_size) { > - if ((sc->work_memory = malloc(32*1024, M_DEVBUF, M_NOWAIT)) == NULL) { > + if ((sc->work_memory = malloc(work_size, M_DEVBUF, M_NOWAIT)) == NULL) { > device_printf(dev, "failed to allocate work memory.\n"); > } else { > @@ -767,5 +767,5 @@ > > if (work_size) > - if ((sc->work_memory = malloc(32*1024, M_DEVBUF, M_NOWAIT)) == NULL) > + if ((sc->work_memory = malloc(work_size, M_DEVBUF, M_NOWAIT)) == NULL) > printf("oltr%d: failed to allocate work memory.\n", unit); > else Good catch Nikolai, I will get that fixed. I am still working on rolling in your patches, make sure I don't lose anything. -- Larry To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-tokenring" in the body of the message