d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OFED: Fix accidental double-copy of rdma_sdp.h in r351176

Browse Source 
The mistake came about like this: the first attempt to commit was blocked by
a pre-commit hook due to missing SVN tags.  svn revert doesn't delete new
files, I guess.  While reapplying the fixed diff, the non-empty target file
was just concatenated with the new contents?  Ugh. :-(
This commit is contained in:
Conrad Meyer 2019-08-18 04:19:41 +00:00
parent b311688b86
commit f49e79b56b
1 changed files with 0 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
sys/ofed/include/rdma/rdma_sdp.h
View File

@ -78,81 +78,3 @@ struct sdp_hah {
} __packed; } __packed;
#endif /* _SYS_OFED_INCLUDE_RDMA_RDMA_SDP_H_ */ #endif /* _SYS_OFED_INCLUDE_RDMA_RDMA_SDP_H_ */
/*-
* SPDX-License-Identifier: BSD-2-Clause-FreeBSD
*
* Copyright (c) 2019 Isilon Systems, LLC.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#ifndef _SYS_OFED_INCLUDE_RDMA_RDMA_SDP_H_
#define _SYS_OFED_INCLUDE_RDMA_RDMA_SDP_H_
#include <sys/cdefs.h>
#include <netinet/in.h>
#include <rdma/ib_cm.h>
union cma_ip_addr {
struct in6_addr ip6;
struct {
__be32 pad[3];
__be32 addr;
} ip4;
};
struct sdp_bsdh {
u8 mid;
u8 flags;
__u16 bufs;
__u32 len;
__u32 mseq;
__u32 mseq_ack;
} __packed;
struct sdp_hh {
struct sdp_bsdh bsdh;
u8 majv_minv;
u8 ipv_cap;
u8 rsvd1;
u8 max_adverts;
__u32 desremrcvsz;
__u32 localrcvsz;
__u16 port;
__u16 rsvd2;
union cma_ip_addr src_addr;
union cma_ip_addr dst_addr;
u8 rsvd3[IB_CM_REQ_PRIVATE_DATA_SIZE - sizeof(struct sdp_bsdh) - 48];
} __packed;
struct sdp_hah {
struct sdp_bsdh bsdh;
u8 majv_minv;
u8 ipv_cap;
u8 rsvd1;
u8 ext_max_adverts;
__u32 actrcvsz;
u8 rsvd2[IB_CM_REP_PRIVATE_DATA_SIZE - sizeof(struct sdp_bsdh) - 8];
} __packed;
#endif /* _SYS_OFED_INCLUDE_RDMA_RDMA_SDP_H_ */