From 2d7d8c05e7404fbebf1f0fe24c13bc5bb58d2338 Mon Sep 17 00:00:00 2001
From: jeff <jeff@FreeBSD.org>
Date: Mon, 21 Mar 2011 09:40:01 +0000
Subject:  - Merge changes to the base system to support OFED.  These include  
  a wider arg2 for sysctl, updates to vlan code, IFT_INFINIBAND,    and other
 miscellaneous small features.

---
 sys/netinet6/in6.c     | 1 +
 sys/netinet6/nd6.c     | 1 +
 sys/netinet6/nd6_nbr.c | 2 ++
 3 files changed, 4 insertions(+)

(limited to 'sys/netinet6')

diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index ba3ceae9..c522422 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -2298,6 +2298,7 @@ in6_if2idlen(struct ifnet *ifp)
 #ifdef IFT_MIP
 	case IFT_MIP:	/* ditto */
 #endif
+	case IFT_INFINIBAND:
 		return (64);
 	case IFT_FDDI:		/* RFC2467 */
 		return (64);
diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c
index fe8bada..f1e48ea 100644
--- a/sys/netinet6/nd6.c
+++ b/sys/netinet6/nd6.c
@@ -2100,6 +2100,7 @@ nd6_need_cache(struct ifnet *ifp)
 #ifdef IFT_CARP
 	case IFT_CARP:
 #endif
+	case IFT_INFINIBAND:
 	case IFT_GIF:		/* XXX need more cases? */
 	case IFT_PPP:
 	case IFT_TUNNEL:
diff --git a/sys/netinet6/nd6_nbr.c b/sys/netinet6/nd6_nbr.c
index 720ae1f..3b4b655 100644
--- a/sys/netinet6/nd6_nbr.c
+++ b/sys/netinet6/nd6_nbr.c
@@ -1132,6 +1132,7 @@ nd6_ifptomac(struct ifnet *ifp)
 #ifdef IFT_CARP
 	case IFT_CARP:
 #endif
+	case IFT_INFINIBAND:
 	case IFT_BRIDGE:
 	case IFT_ISO88025:
 		return IF_LLADDR(ifp);
@@ -1449,6 +1450,7 @@ nd6_dad_duplicated(struct ifaddr *ifa)
 #ifdef IFT_IEEE80211
 		case IFT_IEEE80211:
 #endif
+		case IFT_INFINIBAND:
 			in6 = ia->ia_addr.sin6_addr;
 			if (in6_get_hw_ifid(ifp, &in6) == 0 &&
 			    IN6_ARE_ADDR_EQUAL(&ia->ia_addr.sin6_addr, &in6)) {
-- 
cgit v1.1