From owner-svn-src-head@FreeBSD.ORG Fri Aug 9 03:26:18 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 04F9A431; Fri, 9 Aug 2013 03:26:18 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E7CB928C9; Fri, 9 Aug 2013 03:26:17 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r793QHtK006308; Fri, 9 Aug 2013 03:26:17 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r793QHQX006305; Fri, 9 Aug 2013 03:26:17 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201308090326.r793QHQX006305@svn.freebsd.org> From: Jeff Roberson Date: Fri, 9 Aug 2013 03:26:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r254122 - in head/sys: ofed/include/rdma sys X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Aug 2013 03:26:18 -0000 Author: jeff Date: Fri Aug 9 03:26:17 2013 New Revision: 254122 URL: http://svnweb.freebsd.org/changeset/base/254122 Log: - Reserve a special AF for SDP. The one we were incorrectly using before was taken by another AF. Sponsored by: EMC / Isilon Storage Division Modified: head/sys/ofed/include/rdma/sdp_socket.h head/sys/sys/socket.h Modified: head/sys/ofed/include/rdma/sdp_socket.h ============================================================================== --- head/sys/ofed/include/rdma/sdp_socket.h Fri Aug 9 03:24:48 2013 (r254121) +++ head/sys/ofed/include/rdma/sdp_socket.h Fri Aug 9 03:26:17 2013 (r254122) @@ -3,10 +3,12 @@ #ifndef SDP_SOCKET_H #define SDP_SOCKET_H +#ifndef __FreeBSD__ #ifndef AF_INET_SDP #define AF_INET_SDP 27 #define PF_INET_SDP AF_INET_SDP #endif +#endif #ifndef SDP_ZCOPY_THRESH #define SDP_ZCOPY_THRESH 80 Modified: head/sys/sys/socket.h ============================================================================== --- head/sys/sys/socket.h Fri Aug 9 03:24:48 2013 (r254121) +++ head/sys/sys/socket.h Fri Aug 9 03:26:17 2013 (r254122) @@ -230,7 +230,9 @@ struct accept_filter_arg { #define AF_ARP 35 #define AF_BLUETOOTH 36 /* Bluetooth sockets */ #define AF_IEEE80211 37 /* IEEE 802.11 protocol */ -#define AF_MAX 38 +#define AF_INET_SDP 40 /* OFED Socket Direct Protocol ipv4 */ +#define AF_INET6_SDP 42 /* OFED Socket Direct Protocol ipv6 */ +#define AF_MAX 42 /* * When allocating a new AF_ constant, please only allocate * even numbered constants for FreeBSD until 134 as odd numbered AF_ @@ -353,6 +355,8 @@ struct sockproto { #define PF_ARP AF_ARP #define PF_BLUETOOTH AF_BLUETOOTH #define PF_IEEE80211 AF_IEEE80211 +#define PF_INET_SDP AF_INET_SDP +#define PF_INET6_SDP AF_INET6_SDP #define PF_MAX AF_MAX