public inbox for linux-rdma@vger.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/4] Add IBV_*_USNIC enums for the Cisco Ethernet Virtual NIC.
@ 2013-04-03 13:06 Jeff Squyres
       [not found] ` <1364994415-8330-1-git-send-email-jsquyres-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
  0 siblings, 1 reply; 17+ messages in thread
From: Jeff Squyres @ 2013-04-03 13:06 UTC (permalink / raw)
  To: linux-rdma-u79uwXL29TY76Z2rM5mHXA
  Cc: umalhi-FYB4Gu1CFyUAvxtiuMwx3w, Jeff Squyres

Per off-list conversation with Roland, add some new enums for the
Cisco Ethernet Virtual NIC (it's not an RNIC/iWARP device, so it
doesn't fit in the same category as RDMA_NODE_RNIC / RDMA_TRANSPORT_IWARP).

"USNIC" = "Userspace NIC".

---
 examples/devinfo.c         | 1 +
 include/infiniband/verbs.h | 6 ++++--
 src/enum_strs.c            | 5 +++--
 src/init.c                 | 5 ++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/examples/devinfo.c b/examples/devinfo.c
index 7dc0463..98a6b4b 100644
--- a/examples/devinfo.c
+++ b/examples/devinfo.c
@@ -72,6 +72,7 @@ static const char *transport_str(enum ibv_transport_type transport)
 	switch (transport) {
 	case IBV_TRANSPORT_IB:    return "InfiniBand";
 	case IBV_TRANSPORT_IWARP: return "iWARP";
+	case IBV_TRANSPORT_USNIC: return "USNIC";
 	default:		  return "invalid transport";
 	}
 }
diff --git a/include/infiniband/verbs.h b/include/infiniband/verbs.h
index 6acfc81..6a6944c 100644
--- a/include/infiniband/verbs.h
+++ b/include/infiniband/verbs.h
@@ -68,13 +68,15 @@ enum ibv_node_type {
 	IBV_NODE_CA 		= 1,
 	IBV_NODE_SWITCH,
 	IBV_NODE_ROUTER,
-	IBV_NODE_RNIC
+	IBV_NODE_RNIC,
+	IBV_NODE_USNIC
 };
 
 enum ibv_transport_type {
 	IBV_TRANSPORT_UNKNOWN	= -1,
 	IBV_TRANSPORT_IB	= 0,
-	IBV_TRANSPORT_IWARP
+	IBV_TRANSPORT_IWARP,
+	IBV_TRANSPORT_USNIC
 };
 
 enum ibv_device_cap_flags {
diff --git a/src/enum_strs.c b/src/enum_strs.c
index 54d71a6..0d68c75 100644
--- a/src/enum_strs.c
+++ b/src/enum_strs.c
@@ -38,10 +38,11 @@ const char *ibv_node_type_str(enum ibv_node_type node_type)
 		[IBV_NODE_CA]		= "InfiniBand channel adapter",
 		[IBV_NODE_SWITCH]	= "InfiniBand switch",
 		[IBV_NODE_ROUTER]	= "InfiniBand router",
-		[IBV_NODE_RNIC]		= "iWARP NIC"
+		[IBV_NODE_RNIC]		= "iWARP NIC",
+		[IBV_NODE_USNIC]	= "Ethernet USNIC"
 	};
 
-	if (node_type < IBV_NODE_CA || node_type > IBV_NODE_RNIC)
+	if (node_type < IBV_NODE_CA || node_type > IBV_NODE_USNIC)
 		return "unknown";
 
 	return node_type_str[node_type];
diff --git a/src/init.c b/src/init.c
index 8d6786e..e4ef001 100644
--- a/src/init.c
+++ b/src/init.c
@@ -346,7 +346,7 @@ static struct ibv_device *try_driver(struct ibv_driver *driver,
 			dev->node_type = IBV_NODE_UNKNOWN;
 	} else {
 		dev->node_type = strtol(value, NULL, 10);
-		if (dev->node_type < IBV_NODE_CA || dev->node_type > IBV_NODE_RNIC)
+		if (dev->node_type < IBV_NODE_CA || dev->node_type > IBV_NODE_USNIC)
 			dev->node_type = IBV_NODE_UNKNOWN;
 	}
 
@@ -359,6 +359,9 @@ static struct ibv_device *try_driver(struct ibv_driver *driver,
 	case IBV_NODE_RNIC:
 		dev->transport_type = IBV_TRANSPORT_IWARP;
 		break;
+	case IBV_NODE_USNIC:
+		dev->transport_type = IBV_TRANSPORT_USNIC;
+		break;
 	default:
 		dev->transport_type = IBV_TRANSPORT_UNKNOWN;
 		break;
-- 
1.8.1.1

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

^ permalink raw reply related	[flat|nested] 17+ messages in thread

end of thread, other threads:[~2013-04-09  5:47 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-04-03 13:06 [PATCH 1/4] Add IBV_*_USNIC enums for the Cisco Ethernet Virtual NIC Jeff Squyres
     [not found] ` <1364994415-8330-1-git-send-email-jsquyres-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
2013-04-03 13:06   ` [PATCH 2/4] Add IBV_MTU_1500|9000 enums Jeff Squyres
2013-04-03 13:06   ` [PATCH 3/4] Use autoreconf in autogen.sh Jeff Squyres
     [not found]     ` <1364994415-8330-3-git-send-email-jsquyres-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
2013-04-08 21:59       ` Jeff Squyres (jsquyres)
     [not found]         ` <EF66BBEB19BADC41AC8CCF5F684F07FC43FFA956-nsZYYkk5h5QQ2GdVW7+PtKBKnGwkPULj@public.gmane.org>
2013-04-09  5:47           ` Or Gerlitz
2013-04-03 13:06   ` [PATCH 4/4] .gitignore updates and renameconfigure.in->.ac Jeff Squyres
2013-04-03 14:49   ` [PATCH 1/4] Add IBV_*_USNIC enums for the Cisco Ethernet Virtual NIC Hefty, Sean
     [not found]     ` <1828884A29C6694DAF28B7E6B8A823736F36A3A6-P5GAC/sN6hmkrb+BlOpmy7fspsVTdybXVpNB7YpNyf8@public.gmane.org>
2013-04-03 18:45       ` Or Gerlitz
     [not found]         ` <CAJZOPZLJWBvqFVUdYch+xU6yFwc0dKTBUb5qV_Hbxf=8HEKkqw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-04 12:10           ` Jeff Squyres (jsquyres)
2013-04-04 12:09       ` Jeff Squyres (jsquyres)
     [not found]         ` <EF66BBEB19BADC41AC8CCF5F684F07FC43FE14D8-nsZYYkk5h5QQ2GdVW7+PtKBKnGwkPULj@public.gmane.org>
2013-04-04 14:32           ` Hefty, Sean
     [not found]             ` <1828884A29C6694DAF28B7E6B8A823736F36B84D-P5GAC/sN6hmkrb+BlOpmy7fspsVTdybXVpNB7YpNyf8@public.gmane.org>
2013-04-05 18:21               ` Jeff Squyres (jsquyres)
     [not found]                 ` <9BFE3950-6954-4E9F-9300-284EC675F3F3-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
2013-04-05 19:02                   ` Hefty, Sean
2013-04-04 21:27           ` Or Gerlitz
     [not found]             ` <CAJZOPZKQ_QFdTj-uYOBuBXcipxO1Drj7v4_U_euYzOe1Y6648Q-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-05 18:19               ` Jeff Squyres (jsquyres)
     [not found]                 ` <02A33CE5-6894-4F88-8493-2ACD9FF81B5E-FYB4Gu1CFyUAvxtiuMwx3w@public.gmane.org>
2013-04-05 20:40                   ` Roland Dreier
     [not found]                     ` <CAL1RGDXSqyAyHZbWcH5WQcaEJ_vnfn+67WYd57Hy-4EO-KRUyg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2013-04-08 21:52                       ` Jeff Squyres (jsquyres)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox