From owner-svn-src-all@FreeBSD.ORG Mon Feb 14 16:54:03 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B96AC106564A; Mon, 14 Feb 2011 16:54:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8FC738FC08; Mon, 14 Feb 2011 16:54:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1EGs3Lk099648; Mon, 14 Feb 2011 16:54:03 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1EGs3TM099645; Mon, 14 Feb 2011 16:54:03 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <201102141654.p1EGs3TM099645@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Mon, 14 Feb 2011 16:54:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218684 - in stable/8/sys: conf netinet X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Feb 2011 16:54:03 -0000 Author: bz Date: Mon Feb 14 16:54:03 2011 New Revision: 218684 URL: http://svn.freebsd.org/changeset/base/218684 Log: MFC r216466: 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. Discussed with: rwatson Modified: stable/8/sys/conf/NOTES stable/8/sys/netinet/if_atm.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) Modified: stable/8/sys/conf/NOTES ============================================================================== --- stable/8/sys/conf/NOTES Mon Feb 14 16:38:32 2011 (r218683) +++ stable/8/sys/conf/NOTES Mon Feb 14 16:54:03 2011 (r218684) @@ -2120,7 +2120,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: stable/8/sys/netinet/if_atm.c ============================================================================== --- stable/8/sys/netinet/if_atm.c Mon Feb 14 16:38:32 2011 (r218683) +++ stable/8/sys/netinet/if_atm.c Mon Feb 14 16:54:03 2011 (r218684) @@ -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(); }