Enable IPv6 for Token Ring.

This commit is contained in:
Matthew N. Dodd 2003-09-14 02:32:31 +00:00
parent f8f1abafd2
commit 2049fdeefd
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=120049
4 changed files with 7 additions and 4 deletions

View File

@ -293,7 +293,6 @@ iso88025_output(ifp, m, dst, rt0)
snap_type = ETHERTYPE_IP;
break;
#endif /* INET */
#ifdef NOT_YET
#ifdef INET6
case AF_INET6:
if (!nd6_storelladdr(&ac->ac_if, rt, m, dst, (u_char *)edst)) {
@ -303,7 +302,6 @@ iso88025_output(ifp, m, dst, rt0)
snap_type = ETHERTYPE_IPV6;
break;
#endif /* INET6 */
#endif /* NOT_YET */
#ifdef IPX
case AF_IPX:
{
@ -575,14 +573,12 @@ iso88025_input(ifp, m)
isr = NETISR_IPX;
break;
#endif /* IPX_SNAP */
#ifdef NOT_YET
#ifdef INET6
case ETHERTYPE_IPV6:
th->iso88025_shost[0] &= ~(TR_RII);
isr = NETISR_IPV6;
break;
#endif /* INET6 */
#endif /* NOT_YET */
default:
printf("iso88025_input: unexpected llc_snap ether_type 0x%02x\n", type);
ifp->if_noproto++;

View File

@ -263,6 +263,7 @@ get_hw_ifid(ifp, in6)
switch (ifp->if_type) {
case IFT_ETHER:
case IFT_FDDI:
case IFT_ISO88025:
case IFT_ATM:
case IFT_IEEE1394:
#ifdef IFT_IEEE80211

View File

@ -62,6 +62,7 @@
#include <net/if_dl.h>
#include <net/if_types.h>
#include <net/if_atm.h>
#include <net/iso88025.h>
#include <net/fddi.h>
#include <net/route.h>
@ -234,6 +235,9 @@ nd6_setmtu(ifp)
ndi->maxmtu = MIN(ETHERMTU, ifp->if_mtu);
break;
#endif
case IFT_ISO88025:
ndi->maxmtu = MIN(ISO88025_MAX_MTU, ifp->if_mtu);
break;
default:
ndi->maxmtu = ifp->if_mtu;
break;
@ -2087,6 +2091,7 @@ nd6_storelladdr(ifp, rt, m, dst, desten)
#ifdef IFT_IEEE80211
case IFT_IEEE80211:
#endif
case IFT_ISO88025:
ETHER_MAP_IPV6_MULTICAST(&SIN6(dst)->sin6_addr,
desten);
return(1);

View File

@ -971,6 +971,7 @@ nd6_ifptomac(ifp)
#ifdef IFT_IEEE80211
case IFT_IEEE80211:
#endif
case IFT_ISO88025:
return ((caddr_t)(ifp + 1));
break;
default: