svn commit: r218684 - in stable/8/sys: conf netinet

[Bjoern A. Zeeb]

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