svn commit: r216466 - in head/sys: conf netinet

[Bjoern A. Zeeb]

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.
         <ks> Going to jail sucks -- <bz> All my daemons like it!
   http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/jails.html