From owner-svn-src-projects@FreeBSD.ORG Wed Oct 27 23:22:44 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 684771065716; Wed, 27 Oct 2010 23:22:44 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CF93B8FC16; Wed, 27 Oct 2010 23:22:43 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o9RNMhRE043910; Wed, 27 Oct 2010 23:22:43 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o9RNMhdE043906; Wed, 27 Oct 2010 23:22:43 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201010272322.o9RNMhdE043906@svn.freebsd.org> From: Jeff Roberson Date: Wed, 27 Oct 2010 23:22:43 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r214437 - projects/ofed/head/sys/netinet6 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Oct 2010 23:22:44 -0000 Author: jeff Date: Wed Oct 27 23:22:43 2010 New Revision: 214437 URL: http://svn.freebsd.org/changeset/base/214437 Log: - Treat IFT_INFINIBAND just like IFT_ETHER in most cases, even when default: would DTRT add explicit switch labels for ib. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/netinet6/in6.c projects/ofed/head/sys/netinet6/nd6.c projects/ofed/head/sys/netinet6/nd6_nbr.c Modified: projects/ofed/head/sys/netinet6/in6.c ============================================================================== --- projects/ofed/head/sys/netinet6/in6.c Wed Oct 27 23:21:30 2010 (r214436) +++ projects/ofed/head/sys/netinet6/in6.c Wed Oct 27 23:22:43 2010 (r214437) @@ -2281,6 +2281,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); Modified: projects/ofed/head/sys/netinet6/nd6.c ============================================================================== --- projects/ofed/head/sys/netinet6/nd6.c Wed Oct 27 23:21:30 2010 (r214436) +++ projects/ofed/head/sys/netinet6/nd6.c Wed Oct 27 23:22:43 2010 (r214437) @@ -2041,6 +2041,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: Modified: projects/ofed/head/sys/netinet6/nd6_nbr.c ============================================================================== --- projects/ofed/head/sys/netinet6/nd6_nbr.c Wed Oct 27 23:21:30 2010 (r214436) +++ projects/ofed/head/sys/netinet6/nd6_nbr.c Wed Oct 27 23:22:43 2010 (r214437) @@ -1102,6 +1102,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); @@ -1419,6 +1420,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)) {