From: Parav Pandit Date: Sat, 6 Nov 2021 06:41:52 +0000 (+0200) Subject: vdpa: Remove duplicate vdpa UAPI header file X-Git-Tag: v5.17.0~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a21458fc35336108acd4b75b4d8e1ef7f7e7d9a1;p=thirdparty%2Fiproute2.git vdpa: Remove duplicate vdpa UAPI header file vdpa header file is already present in the tree at vdpa/include/uapi/linux/vdpa.h and used by vdpa/vdpa.c. As we discussed in thread [1] vdpa header comes from a different tree, similar to rdma subsystem. Hence remove the duplicate vdpa UAPI header file. [1] https://www.spinics.net/lists/netdev/msg748458.html Fixes: b5a6ed9cc9fc ("uapi: add missing virtio related headers") Signed-off-by: Parav Pandit Signed-off-by: David Ahern --- diff --git a/include/uapi/linux/vdpa.h b/include/uapi/linux/vdpa.h deleted file mode 100644 index 37ae26b6b..000000000 --- a/include/uapi/linux/vdpa.h +++ /dev/null @@ -1,40 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */ -/* - * vdpa device management interface - * Copyright (c) 2020 Mellanox Technologies Ltd. All rights reserved. - */ - -#ifndef _LINUX_VDPA_H_ -#define _LINUX_VDPA_H_ - -#define VDPA_GENL_NAME "vdpa" -#define VDPA_GENL_VERSION 0x1 - -enum vdpa_command { - VDPA_CMD_UNSPEC, - VDPA_CMD_MGMTDEV_NEW, - VDPA_CMD_MGMTDEV_GET, /* can dump */ - VDPA_CMD_DEV_NEW, - VDPA_CMD_DEV_DEL, - VDPA_CMD_DEV_GET, /* can dump */ -}; - -enum vdpa_attr { - VDPA_ATTR_UNSPEC, - - /* bus name (optional) + dev name together make the parent device handle */ - VDPA_ATTR_MGMTDEV_BUS_NAME, /* string */ - VDPA_ATTR_MGMTDEV_DEV_NAME, /* string */ - VDPA_ATTR_MGMTDEV_SUPPORTED_CLASSES, /* u64 */ - - VDPA_ATTR_DEV_NAME, /* string */ - VDPA_ATTR_DEV_ID, /* u32 */ - VDPA_ATTR_DEV_VENDOR_ID, /* u32 */ - VDPA_ATTR_DEV_MAX_VQS, /* u32 */ - VDPA_ATTR_DEV_MAX_VQ_SIZE, /* u16 */ - - /* new attributes must be added above here */ - VDPA_ATTR_MAX, -}; - -#endif