From 0de0dd9be84cac4ad523cb353c3ad9c4a24134d1 Mon Sep 17 00:00:00 2001
From: Hiroki Sato <hrs@FreeBSD.org>
Date: Wed, 31 Jul 2013 16:24:49 +0000
Subject: [PATCH] Allocate in6_ifextra (ifp->if_afdata[AF_INET6]) only for
 IPv6-capable interfaces.  This eliminates unnecessary IPv6 processing for
 non-IPv6 interfaces.

MFC after:	3 days
---
 sys/netinet6/in6.c          | 7 +++++++
 sys/netinet6/in6_ifattach.c | 9 +--------
 sys/netinet6/nd6.c          | 4 ++++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index f8c2b7e4de86..a8930d79d7fe 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -2746,6 +2746,13 @@ in6_domifattach(struct ifnet *ifp)
 {
 	struct in6_ifextra *ext;
 
+	/* There are not IPv6-capable interfaces. */
+	switch (ifp->if_type) {
+	case IFT_PFLOG:
+	case IFT_PFSYNC:
+	case IFT_USB:
+		return (NULL);
+	}
 	ext = (struct in6_ifextra *)malloc(sizeof(*ext), M_IFADDR, M_WAITOK);
 	bzero(ext, sizeof(*ext));
 
diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c
index 674356a91b4b..9e089d9e2223 100644
--- a/sys/netinet6/in6_ifattach.c
+++ b/sys/netinet6/in6_ifattach.c
@@ -724,15 +724,8 @@ in6_ifattach(struct ifnet *ifp, struct ifnet *altifp)
 	struct in6_ifaddr *ia;
 	struct in6_addr in6;
 
-	/* some of the interfaces are inherently not IPv6 capable */
-	switch (ifp->if_type) {
-	case IFT_PFLOG:
-	case IFT_PFSYNC:
-		ND_IFINFO(ifp)->flags &= ~ND6_IFF_AUTO_LINKLOCAL;
-		ND_IFINFO(ifp)->flags |= ND6_IFF_IFDISABLED;
+	if (ifp->if_afdata[AF_INET6] == NULL)
 		return;
-	}
-
 	/*
 	 * quirks based on interface type
 	 */
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index 0a67a8a91bb6..2c27c714cec6 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -1227,6 +1227,8 @@ nd6_ioctl(u_long cmd, caddr_t data, struct ifnet *ifp)
 	struct nd_prefix *pr;
 	int i = 0, error = 0;
 
+	if (ifp->if_afdata[AF_INET6] == NULL)
+		return (EPFNOSUPPORT);
 	switch (cmd) {
 	case SIOCGDRLST_IN6:
 		/*
@@ -1801,6 +1803,8 @@ nd6_slowtimo(void *arg)
 	    nd6_slowtimo, curvnet);
 	IFNET_RLOCK_NOSLEEP();
 	TAILQ_FOREACH(ifp, &V_ifnet, if_list) {
+		if (ifp->if_afdata[AF_INET6] == NULL)
+			continue;
 		nd6if = ND_IFINFO(ifp);
 		if (nd6if->basereachable && /* already initialized */
 		    (nd6if->recalctm -= ND6_SLOWTIMER_INTERVAL) <= 0) {