diff mbox

[for-next,1/6] IB/usnic: Update ABI and Version file for UDP support

Message ID 1387571903-9398-2-git-send-email-umalhi@cisco.com (mailing list archive)
State Rejected
Headers show

Commit Message

Upinder Malhi (umalhi) Dec. 20, 2013, 8:38 p.m. UTC
Expand the kernel/userspace interface so userspace may push down
a socket file descriptor to usNIC.  Also, bump up the abi and version
numbers.

Signed-off-by: Upinder Malhi <umalhi@cisco.com>
---
 drivers/infiniband/hw/usnic/usnic.h     |  4 ++--
 drivers/infiniband/hw/usnic/usnic_abi.h | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

--
1.8.1

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/infiniband/hw/usnic/usnic.h b/drivers/infiniband/hw/usnic/usnic.h
index d741c76..5be13d8 100644
--- a/drivers/infiniband/hw/usnic/usnic.h
+++ b/drivers/infiniband/hw/usnic/usnic.h
@@ -23,7 +23,7 @@ 

 #define PCI_DEVICE_ID_CISCO_VIC_USPACE_NIC	0x00cf	/* User space NIC */

-#define DRV_VERSION    "1.0.2"
-#define DRV_RELDATE    "September 09, 2013"
+#define DRV_VERSION    "1.0.3"
+#define DRV_RELDATE    "December 19, 2013"

 #endif /* USNIC_H_ */
diff --git a/drivers/infiniband/hw/usnic/usnic_abi.h b/drivers/infiniband/hw/usnic/usnic_abi.h
index 7eb49f4..730a371 100644
--- a/drivers/infiniband/hw/usnic/usnic_abi.h
+++ b/drivers/infiniband/hw/usnic/usnic_abi.h
@@ -21,7 +21,7 @@ 
 #define USNIC_ABI_H

 /* ABI between userspace and kernel */
-#define USNIC_UVERBS_ABI_VERSION	2
+#define USNIC_UVERBS_ABI_VERSION	3

 #define USNIC_QP_GRP_MAX_WQS		8
 #define USNIC_QP_GRP_MAX_RQS		8
@@ -30,7 +30,8 @@ 
 enum usnic_transport_type {
 	USNIC_TRANSPORT_UNKNOWN		= 0,
 	USNIC_TRANSPORT_ROCE_CUSTOM	= 1,
-	USNIC_TRANSPORT_MAX		= 2,
+	USNIC_TRANSPORT_IPV4_UDP	= 2,
+	USNIC_TRANSPORT_MAX		= 3,
 };

 struct usnic_transport_spec {
@@ -39,9 +40,16 @@  struct usnic_transport_spec {
 		struct {
 			uint16_t	port_num;
 		} usnic_roce;
+		struct {
+			uint32_t	sock_fd;
+		} udp;
 	};
 };

+struct usnic_ib_create_qp_cmd {
+	struct usnic_transport_spec	spec;
+};
+
 /*TODO: Future - usnic_modify_qp needs to pass in generic filters */
 struct usnic_ib_create_qp_resp {
 	u32				vfid;