3 files changed, 8 insertions, 2 deletions

diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index cde1e7b5b85d..faad2caf22b1 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -612,6 +612,7 @@ static ssize_t show_node_type(struct device *device,
         switch (dev->node_type) {
         case RDMA_NODE_IB_CA:     return sprintf(buf, "%d: CA\n", dev->node_type);
         case RDMA_NODE_RNIC:      return sprintf(buf, "%d: RNIC\n", dev->node_type);
+        case RDMA_NODE_USNIC:     return sprintf(buf, "%d: usNIC\n", dev->node_type);
         case RDMA_NODE_IB_SWITCH: return sprintf(buf, "%d: switch\n", dev->node_type);
         case RDMA_NODE_IB_ROUTER: return sprintf(buf, "%d: router\n", dev->node_type);
         default:                  return sprintf(buf, "%d: <unknown>\n", dev->node_type);
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c
index a321df28bab2..84f502785f89 100644
--- a/drivers/infiniband/core/verbs.c
+++ b/drivers/infiniband/core/verbs.c
@@ -114,6 +114,8 @@ rdma_node_get_transport(enum rdma_node_type node_type)
                 return RDMA_TRANSPORT_IB;
         case RDMA_NODE_RNIC:
                 return RDMA_TRANSPORT_IWARP;
+        case RDMA_NODE_USNIC:
+                return RDMA_TRANSPORT_USNIC;
         default:
                 BUG();
                 return 0;
@@ -130,6 +132,7 @@ enum rdma_link_layer rdma_port_get_link_layer(struct ib_device *device, u8 port_
         case RDMA_TRANSPORT_IB:
                 return IB_LINK_LAYER_INFINIBAND;
         case RDMA_TRANSPORT_IWARP:
+        case RDMA_TRANSPORT_USNIC:
                 return IB_LINK_LAYER_ETHERNET;
         default:
                 return IB_LINK_LAYER_UNSPECIFIED;
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index e393171e2fac..60354d53948e 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -67,12 +67,14 @@ enum rdma_node_type {
         RDMA_NODE_IB_CA         = 1,
         RDMA_NODE_IB_SWITCH,
         RDMA_NODE_IB_ROUTER,
-        RDMA_NODE_RNIC
+        RDMA_NODE_RNIC,
+        RDMA_NODE_USNIC,
 };
 
 enum rdma_transport_type {
         RDMA_TRANSPORT_IB,
-        RDMA_TRANSPORT_IWARP
+        RDMA_TRANSPORT_IWARP,
+        RDMA_TRANSPORT_USNIC
 };
 
 enum rdma_transport_type