aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjoern A. Zeeb <bz@FreeBSD.org>2010-12-15 22:58:45 +0000
committerBjoern A. Zeeb <bz@FreeBSD.org>2010-12-15 22:58:45 +0000
commit8c9cef57acba1a5e8e9525fe88702ef356fbe437 (patch)
tree7c5a1784c2e94e9505d61c6815f4e8e46ee8fbc5
parente0f389c8d327d1d01fc31bcc974e7205d2c2c92b (diff)
downloadsrc-8c9cef57acba1a5e8e9525fe88702ef356fbe437.tar.gz
src-8c9cef57acba1a5e8e9525fe88702ef356fbe437.zip
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
Notes
Notes: svn path=/head/; revision=216466
-rw-r--r--sys/conf/NOTES2
-rw-r--r--sys/netinet/if_atm.c6
2 files changed, 7 insertions, 1 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 9b377398b1bb..210921c532f9 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -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
diff --git a/sys/netinet/if_atm.c b/sys/netinet/if_atm.c
index d534a1847967..c46460e11bc3 100644
--- a/sys/netinet/if_atm.c
+++ b/sys/netinet/if_atm.c
@@ -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 @@ 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();
}