Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 843debb8 authored by Leon Romanovsky's avatar Leon Romanovsky Committed by Doug Ledford
Browse files

RDMA/core: Commonize RDMA IOCTL declarations location 



This patch provides one common file (rdma_user_ioctl.h)
for all RDMA UAPI IOCTLs.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Signed-off-by: default avatarHaggai Eran <haggaie@mellanox.com>
Signed-off-by: default avatarLeon Romanovsky <leonro@mellanox.com>
Reviewed-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent a121103c

include/uapi/rdma/Kbuild

+1 −0
Original line number Diff line number Diff line 
# UAPI Header export list

header-y += ib_user_cm.h

header-y += rdma_user_ioctl.h

header-y += ib_user_mad.h

header-y += ib_user_sa.h

header-y += ib_user_verbs.h

include/uapi/rdma/hfi/hfi1_user.h

+1 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
#define _LINUX__HFI1_USER_H



#include <linux/types.h>

#include <rdma/rdma_user_ioctl.h>



/*

 * This version number is given to the driver by the user code during
@@ -132,7 +133,6 @@ 
 * User IOCTLs can not go above 128 if they do then see common.h and change the

 * base for the snoop ioctl

 */

#define IB_IOCTL_MAGIC 0x1b /* See Documentation/ioctl/ioctl-number.txt */



/*

 * Make the ioctls occupy the last 0xf0-0xff portion of the IB range

include/uapi/rdma/ib_user_mad.h

+1 −3
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#define IB_USER_MAD_H



#include <linux/types.h>

#include <linux/ioctl.h>

#include <rdma/rdma_user_ioctl.h>



/*

 * Increment this value if any changes that break userspace ABI
@@ -230,8 +230,6 @@ struct ib_user_mad_reg_req2 { 
	__u8	reserved[3];

};



#define IB_IOCTL_MAGIC		0x1b



#define IB_USER_MAD_REGISTER_AGENT	_IOWR(IB_IOCTL_MAGIC, 1, \

					      struct ib_user_mad_reg_req)

include/uapi/rdma/rdma_user_ioctl.h

0 → 100644
+43 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016 Mellanox Technologies, LTD. All rights reserved.

 *

 * This software is available to you under a choice of one of two

 * licenses.  You may choose to be licensed under the terms of the GNU

 * General Public License (GPL) Version 2, available from the file

 * COPYING in the main directory of this source tree, or the

 * OpenIB.org BSD license below:

 *

 *     Redistribution and use in source and binary forms, with or

 *     without modification, are permitted provided that the following

 *     conditions are met:

 *

 *      - Redistributions of source code must retain the above

 *        copyright notice, this list of conditions and the following

 *        disclaimer.

 *

 *      - 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.

 *

 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,

 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF

 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS

 * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN

 * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN

 * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

 * SOFTWARE.

 */



#ifndef RDMA_USER_IOCTL_H

#define RDMA_USER_IOCTL_H



#include <linux/types.h>

#include <linux/ioctl.h>



/* Documentation/ioctl/ioctl-number.txt */

#define RDMA_IOCTL_MAGIC		0x1b

#define IB_IOCTL_MAGIC			RDMA_IOCTL_MAGIC



#endif /* RDMA_USER_IOCTL_H */