33c33
< __FBSDID("$FreeBSD: head/sys/netinet6/in6_ifattach.c 250251 2013-05-04 19:16:26Z hrs $");
---
> __FBSDID("$FreeBSD: head/sys/netinet6/in6_ifattach.c 252511 2013-07-02 16:58:15Z hrs $");
268a269
> case IFT_BRIDGE:
729a731,732
> ND_IFINFO(ifp)->flags &= ~ND6_IFF_AUTO_LINKLOCAL;
> ND_IFINFO(ifp)->flags |= ND6_IFF_IFDISABLED;
737d739
< #ifdef IFT_STF
745,746c747,748
< goto statinit;
< #endif
---
> ND_IFINFO(ifp)->flags &= ~ND6_IFF_AUTO_LINKLOCAL;
> break;
780,781c782
< if (ifp->if_type != IFT_BRIDGE &&
< !(ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) &&
---
> if (!(ND_IFINFO(ifp)->flags & ND6_IFF_IFDISABLED) &&
798,801d798
< #ifdef IFT_STF /* XXX */
< statinit:
< #endif
<