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/net/ethernet/qlogic/qed/qed_dcbx.c | |
| 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/net/ethernet/qlogic/qed/qed_dcbx.c')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qed/qed_dcbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c index f888045..eaca457 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dcbx.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dcbx.c @@ -44,7 +44,7 @@ #include "qed_hsi.h" #include "qed_sp.h" #include "qed_sriov.h" -#include "qed_roce.h" +#include "qed_rdma.h" #ifdef CONFIG_DCB #include <linux/qed/qed_eth_if.h> #endif |
