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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
