diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-21 15:33:00 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-21 15:33:00 -0400 |
| commit | 52f80dca7a1a9f4ad6f6bd5a9b9d25851e3d670a (patch) | |
| tree | cd451fcec89c8c4488bc031a85b0bcb189984d7f /drivers/infiniband/hw | |
| parent | e86283071fb0eed28136adb52997888f4beb202b (diff) | |
| parent | 7003cdd6a121e7bdb8a05eb1931f9549a36ea723 (diff) | |
| download | op-kernel-dev-52f80dca7a1a9f4ad6f6bd5a9b9d25851e3d670a.zip op-kernel-dev-52f80dca7a1a9f4ad6f6bd5a9b9d25851e3d670a.tar.gz | |
Merge branch 'qed-File-split-and-rename-towards-iWARP-support'
Michal Kalderon says:
====================
qed*: File split and rename towards iWARP support
This patch series makes a few more infrastructure changes towards adding
iWARP support. Hopefully this is the last infrastructure change
prior to the iWARP RFC.
Patch #1-3 take care of taking all the common iWARP/RoCE code out of
qed_roce.[ch] and placing it in qed_rdma.[ch]
Patch #4 renames the roce interface file as it is common for
RoCE and iWARP. This patch touches qedr as well.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/hw')
| -rw-r--r-- | drivers/infiniband/hw/qedr/qedr.h | 2 | ||||
| -rw-r--r-- | drivers/infiniband/hw/qedr/qedr_cm.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/hw/qedr/qedr.h b/drivers/infiniband/hw/qedr/qedr.h index 2376019..15365d5 100644 --- a/drivers/infiniband/hw/qedr/qedr.h +++ b/drivers/infiniband/hw/qedr/qedr.h @@ -36,7 +36,7 @@ #include <rdma/ib_addr.h> #include <linux/qed/qed_if.h> #include <linux/qed/qed_chain.h> -#include <linux/qed/qed_roce_if.h> +#include <linux/qed/qed_rdma_if.h> #include <linux/qed/qede_rdma.h> #include <linux/qed/roce_common.h> #include "qedr_hsi_rdma.h" diff --git a/drivers/infiniband/hw/qedr/qedr_cm.c b/drivers/infiniband/hw/qedr/qedr_cm.c index eb3dce7..4689e80 100644 --- a/drivers/infiniband/hw/qedr/qedr_cm.c +++ b/drivers/infiniband/hw/qedr/qedr_cm.c @@ -44,7 +44,7 @@ #include <rdma/ib_cache.h> #include <linux/qed/qed_if.h> -#include <linux/qed/qed_roce_if.h> +#include <linux/qed/qed_rdma_if.h> #include "qedr.h" #include "verbs.h" #include <rdma/qedr-abi.h> |
