Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S261349AbUKWRTG (ORCPT ); Tue, 23 Nov 2004 12:19:06 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S261385AbUKWRQo (ORCPT ); Tue, 23 Nov 2004 12:16:44 -0500 Received: from umhlanga.stratnet.net ([12.162.17.40]:55167 "EHLO umhlanga.STRATNET.NET") by vger.kernel.org with ESMTP id S261351AbUKWQQE (ORCPT ); Tue, 23 Nov 2004 11:16:04 -0500 Cc: openib-general@openib.org, netdev@oss.sgi.com In-Reply-To: <20041123815.3UphmLcWp4RG6D85@topspin.com> X-Mailer: Roland's Patchbomber Date: Tue, 23 Nov 2004 08:15:57 -0800 Message-Id: <20041123815.OuqXEOqXJtDtY180@topspin.com> Mime-Version: 1.0 To: linux-kernel@vger.kernel.org From: Roland Dreier X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: roland@topspin.com Subject: [PATCH][RFC/v2][16/21] IPoIB IPv6 support Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7BIT X-SA-Exim-Version: 4.1 (built Tue, 17 Aug 2004 11:06:07 +0200) X-SA-Exim-Scanned: Yes (on eddore) X-OriginalArrivalTime: 23 Nov 2004 16:16:03.0396 (UTC) FILETIME=[BA875040:01C4D177] Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2523 Lines: 83 Add ipv6_ib_mc_map() to convert IPv6 multicast addresses to IPoIB hardware addresses, and add support for autoconfiguration for devices with type ARPHRD_INFINIBAND. The mapping for multicast addresses is described in http://www.ietf.org/internet-drafts/draft-ietf-ipoib-ip-over-infiniband-07.txt Signed-off-by: Nitin Hande Signed-off-by: Roland Dreier --- linux-bk.orig/include/net/if_inet6.h 2004-11-23 08:09:55.180272973 -0800 +++ linux-bk/include/net/if_inet6.h 2004-11-23 08:10:22.300274203 -0800 @@ -266,5 +266,20 @@ { buf[0] = 0x00; } + +static inline void ipv6_ib_mc_map(struct in6_addr *addr, char *buf) +{ + buf[0] = 0; /* Reserved */ + buf[1] = 0xff; /* Multicast QPN */ + buf[2] = 0xff; + buf[3] = 0xff; + buf[4] = 0xff; + buf[5] = 0x12; /* link local scope */ + buf[6] = 0x60; /* IPv6 signature */ + buf[7] = 0x1b; + buf[8] = 0; /* P_Key */ + buf[9] = 0; + memcpy(buf + 10, addr->s6_addr + 6, 10); +} #endif #endif --- linux-bk.orig/net/ipv6/addrconf.c 2004-11-23 08:09:54.776332532 -0800 +++ linux-bk/net/ipv6/addrconf.c 2004-11-23 08:10:22.302273908 -0800 @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -1098,6 +1099,12 @@ memset(eui, 0, 7); eui[7] = *(u8*)dev->dev_addr; return 0; + case ARPHRD_INFINIBAND: + if (dev->addr_len != INFINIBAND_ALEN) + return -1; + memcpy(eui, dev->dev_addr + 12, 8); + eui[0] |= 2; + return 0; } return -1; } @@ -1797,6 +1804,7 @@ if ((dev->type != ARPHRD_ETHER) && (dev->type != ARPHRD_FDDI) && (dev->type != ARPHRD_IEEE802_TR) && + (dev->type != ARPHRD_INFINIBAND) && (dev->type != ARPHRD_ARCNET)) { /* Alas, we support only Ethernet autoconfiguration. */ return; --- linux-bk.orig/net/ipv6/ndisc.c 2004-11-23 08:09:38.159782567 -0800 +++ linux-bk/net/ipv6/ndisc.c 2004-11-23 08:10:22.302273908 -0800 @@ -260,6 +260,9 @@ case ARPHRD_ARCNET: ipv6_arcnet_mc_map(addr, buf); return 0; + case ARPHRD_INFINIBAND: + ipv6_ib_mc_map(addr, buf); + return 0; default: if (dir) { memcpy(buf, dev->broadcast, dev->addr_len); - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/