diff options
| author | bz <bz@FreeBSD.org> | 2010-12-15 22:58:45 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2010-12-15 22:58:45 +0000 |
| commit | 29c10913459e15c9dc6f50ee720d44c645494448 (patch) | |
| tree | 7c5a1784c2e94e9505d61c6815f4e8e46ee8fbc5 | |
| parent | 60b768f654fc1da5d29aab98583c0c7d6e2ae334 (diff) | |
| download | FreeBSD-src-29c10913459e15c9dc6f50ee720d44c645494448.zip FreeBSD-src-29c10913459e15c9dc6f50ee720d44c645494448.tar.gz | |
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
| -rw-r--r-- | sys/conf/NOTES | 2 | ||||
| -rw-r--r-- | sys/netinet/if_atm.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 9b37739..210921c 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 d534a18..c46460e 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(); } |
