d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bring back (most of) NATM to avoid further bitrot after r186119.

Browse Source 
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
This commit is contained in:
Bjoern A. Zeeb 2010-12-15 22:58:45 +00:00
parent e0f389c8d3
commit 8c9cef57ac
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=216466
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/conf/NOTES
View File

@ -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

6
sys/netinet/if_atm.c
View File

@ -229,7 +229,9 @@ atm_rtrequest(int req, struct rtentry *rt, struct rt_addrinfo *info)
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 @@ atm_rtrequest(int req, struct rtentry *rt, struct rt_addrinfo *info)
#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 @@ atm_rtrequest(int req, struct rtentry *rt, struct rt_addrinfo *info)
*/
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();
}