From owner-svn-src-head@FreeBSD.ORG  Wed Dec 15 22:58:45 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
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 9AA831065675;
	Wed, 15 Dec 2010 22:58:45 +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 893778FC08;
	Wed, 15 Dec 2010 22:58:45 +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 oBFMwjtb098287;
	Wed, 15 Dec 2010 22:58:45 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBFMwjTW098284;
	Wed, 15 Dec 2010 22:58:45 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201012152258.oBFMwjTW098284@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Wed, 15 Dec 2010 22:58:45 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: 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
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 15 Dec 2010 22:58:45 -0000

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.
  
  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();
 		}