diff options
| author | Jeff Roberson <jeff@FreeBSD.org> | 2013-08-09 03:26:17 +0000 |
|---|---|---|
| committer | Jeff Roberson <jeff@FreeBSD.org> | 2013-08-09 03:26:17 +0000 |
| commit | 863c7e45628d8a4c757566833092a6f96f61f48f (patch) | |
| tree | b8a70b9ae9ef19383940277c2e9ecaa60f87d9ac | |
| parent | 3d71c6cf45c84126af4ce50d0c4c4edc3407026b (diff) | |
- Reserve a special AF for SDP. The one we were incorrectly using before
was taken by another AF.
Sponsored by: EMC / Isilon Storage Division
Notes
svn path=/head/; revision=254122
| -rw-r--r-- | sys/ofed/include/rdma/sdp_socket.h | 2 | ||||
| -rw-r--r-- | sys/sys/socket.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/sys/ofed/include/rdma/sdp_socket.h b/sys/ofed/include/rdma/sdp_socket.h index 902dc9744348..6b075892968e 100644 --- a/sys/ofed/include/rdma/sdp_socket.h +++ b/sys/ofed/include/rdma/sdp_socket.h @@ -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 diff --git a/sys/sys/socket.h b/sys/sys/socket.h index 0ff04f5438c5..084c1a4fa14e 100644 --- a/sys/sys/socket.h +++ b/sys/sys/socket.h @@ -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 |