Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 52f80dca authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents e8628307 7003cdd6

drivers/infiniband/hw/qedr/qedr.h

+1 −1
Original line number Diff line number Diff line
@@ -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"

drivers/infiniband/hw/qedr/qedr_cm.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

drivers/net/ethernet/qlogic/qed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -5,6 +5,6 @@ qed-y := qed_cxt.o qed_dev.o qed_hw.o qed_init_fw_funcs.o qed_init_ops.o \ 
	 qed_selftest.o qed_dcbx.o qed_debug.o qed_ptp.o

qed-$(CONFIG_QED_SRIOV) += qed_sriov.o qed_vf.o

qed-$(CONFIG_QED_LL2) += qed_ll2.o

qed-$(CONFIG_QED_RDMA) += qed_roce.o

qed-$(CONFIG_QED_RDMA) += qed_roce.o qed_rdma.o

qed-$(CONFIG_QED_ISCSI) += qed_iscsi.o qed_ooo.o

qed-$(CONFIG_QED_FCOE) += qed_fcoe.o

drivers/net/ethernet/qlogic/qed/qed_dcbx.c

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/net/ethernet/qlogic/qed/qed_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
#include "qed_sp.h"

#include "qed_sriov.h"

#include "qed_vf.h"

#include "qed_roce.h"

#include "qed_rdma.h"



static DEFINE_SPINLOCK(qm_lock);