From owner-svn-src-head@FreeBSD.ORG Wed Dec 15 23:02:42 2010 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 999161065675; Wed, 15 Dec 2010 23:02:42 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.cksoft.de (mail.cksoft.de [IPv6:2001:4068:10::3]) by mx1.freebsd.org (Postfix) with ESMTP id 538A38FC0A; Wed, 15 Dec 2010 23:02:42 +0000 (UTC) Received: from localhost (amavis.fra.cksoft.de [192.168.74.71]) by mail.cksoft.de (Postfix) with ESMTP id B094141C48B; Thu, 16 Dec 2010 00:02:41 +0100 (CET) X-Virus-Scanned: amavisd-new at cksoft.de Received: from mail.cksoft.de ([192.168.74.103]) by localhost (amavis.fra.cksoft.de [192.168.74.71]) (amavisd-new, port 10024) with ESMTP id M7E1pA0XPJgB; Thu, 16 Dec 2010 00:02:40 +0100 (CET) Received: by mail.cksoft.de (Postfix, from userid 66) id 00EC441C759; Thu, 16 Dec 2010 00:02:39 +0100 (CET) Received: from maildrop.int.zabbadoz.net (maildrop.int.zabbadoz.net [10.111.66.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.int.zabbadoz.net (Postfix) with ESMTP id BFD1044490B; Wed, 15 Dec 2010 23:00:31 +0000 (UTC) Date: Wed, 15 Dec 2010 23:00:31 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@maildrop.int.zabbadoz.net To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org In-Reply-To: <201012152258.oBFMwjTW098284@svn.freebsd.org> Message-ID: <20101215225913.C6126@maildrop.int.zabbadoz.net> References: <201012152258.oBFMwjTW098284@svn.freebsd.org> X-OpenPGP-Key: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Subject: Re: svn commit: r216466 - in head/sys: conf netinet X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 15 Dec 2010 23:02:42 -0000 On Wed, 15 Dec 2010, Bjoern A. Zeeb wrote: > Author: bz > Date: Wed Dec 15 22:58:45 2010 > New Revision: 216466 > URL: http://svn.freebsd.org/changeset/base/216466 > > Log: > Bring back (most of) NATM to avoid further bitrot after r186119. > Keep three lines disabled which I am unsure if they had been used at all. > This will allow us to seek testers and possibly bring it all back. If you have the ability to test (on 8.x or HEAD) or are using NATM, please get in contact with me. > Discussed with: rwatson > MFC after: 7 weeks > > Modified: > head/sys/conf/NOTES > head/sys/netinet/if_atm.c > > Modified: head/sys/conf/NOTES > ============================================================================== > --- head/sys/conf/NOTES Wed Dec 15 22:48:44 2010 (r216465) > +++ head/sys/conf/NOTES Wed Dec 15 22:58:45 2010 (r216466) > @@ -2174,7 +2174,7 @@ device fatm #Fore PCA200E > device hatm #Fore/Marconi HE155/622 > device patm #IDT77252 cards (ProATM and IDT) > device utopia #ATM PHY driver > -#options NATM #native ATM > +options NATM #native ATM > > options LIBMBPOOL #needed by patm, iatm > > > Modified: head/sys/netinet/if_atm.c > ============================================================================== > --- head/sys/netinet/if_atm.c Wed Dec 15 22:48:44 2010 (r216465) > +++ head/sys/netinet/if_atm.c Wed Dec 15 22:58:45 2010 (r216466) > @@ -229,7 +229,9 @@ atm_rtrequest(int req, struct rtentry *r > npcb->npcb_flags |= NPCB_IP; > npcb->ipaddr.s_addr = sin->sin_addr.s_addr; > /* XXX: move npcb to llinfo when ATM ARP is ready */ > +#ifdef __notyet_restored__ > rt->rt_llinfo = (caddr_t) npcb; > +#endif > rt->rt_flags |= RTF_LLINFO; > #endif > /* > @@ -255,7 +257,9 @@ failed: > #ifdef NATM > if (npcb) { > npcb_free(npcb, NPCB_DESTROY); > +#ifdef __notyet_restored__ > rt->rt_llinfo = NULL; > +#endif > rt->rt_flags &= ~RTF_LLINFO; > } > NATM_UNLOCK(); > @@ -273,9 +277,11 @@ failed: > */ > if (rt->rt_flags & RTF_LLINFO) { > NATM_LOCK(); > +#ifdef __notyet_restored__ > npcb_free((struct natmpcb *)rt->rt_llinfo, > NPCB_DESTROY); > rt->rt_llinfo = NULL; > +#endif > rt->rt_flags &= ~RTF_LLINFO; > NATM_UNLOCK(); > } > -- Bjoern A. Zeeb Welcome a new stage of life. Going to jail sucks -- All my daemons like it! http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/jails.html