Commit eeaddf36 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4',... 

Merge branches 'core', 'cxgb3', 'cxgb4', 'iser', 'iwpm', 'misc', 'mlx4', 'mlx5', 'noio', 'ocrdma', 'qib', 'srp' and 'usnic' into for-next
parents 60e1751c 3c735d48 b7dfa889 c7ca4b69 9eccfe10 8385fd84 165cb465 6c9b5d9b 6fcd8d0d 0cc65dd6 0a66d2bd d236cd0e ed477c4c

drivers/infiniband/Makefile

+2 −17
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_INFINIBAND)		+= core/

obj-$(CONFIG_INFINIBAND)		+= core/

obj-$(CONFIG_INFINIBAND_MTHCA)		+= hw/mthca/

obj-$(CONFIG_INFINIBAND)		+= hw/

obj-$(CONFIG_INFINIBAND_IPATH)		+= hw/ipath/

obj-$(CONFIG_INFINIBAND)		+= ulp/
 
obj-$(CONFIG_INFINIBAND_QIB)		+= hw/qib/

obj-$(CONFIG_INFINIBAND_EHCA)		+= hw/ehca/

obj-$(CONFIG_INFINIBAND_AMSO1100)	+= hw/amso1100/

obj-$(CONFIG_INFINIBAND_CXGB3)		+= hw/cxgb3/

obj-$(CONFIG_INFINIBAND_CXGB4)		+= hw/cxgb4/

obj-$(CONFIG_MLX4_INFINIBAND)		+= hw/mlx4/

obj-$(CONFIG_MLX5_INFINIBAND)		+= hw/mlx5/

obj-$(CONFIG_INFINIBAND_NES)		+= hw/nes/

obj-$(CONFIG_INFINIBAND_OCRDMA)		+= hw/ocrdma/

obj-$(CONFIG_INFINIBAND_USNIC)		+= hw/usnic/

obj-$(CONFIG_INFINIBAND_IPOIB)		+= ulp/ipoib/

obj-$(CONFIG_INFINIBAND_SRP)		+= ulp/srp/

obj-$(CONFIG_INFINIBAND_SRPT)		+= ulp/srpt/

obj-$(CONFIG_INFINIBAND_ISER)		+= ulp/iser/

obj-$(CONFIG_INFINIBAND_ISERT)		+= ulp/isert/

drivers/infiniband/core/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ ib_sa-y := sa_query.o multicast.o 




ib_cm-y :=			cm.o

ib_cm-y :=			cm.o





iw_cm-y :=			iwcm.o

iw_cm-y :=			iwcm.o iwpm_util.o iwpm_msg.o





rdma_cm-y :=			cma.o

rdma_cm-y :=			cma.o

drivers/infiniband/core/cma.c

+2 −1
Original line number Original line Diff line number Diff line
@@ -3607,7 +3607,8 @@ static int cma_get_id_stats(struct sk_buff *skb, struct netlink_callback *cb) 




			id_stats = ibnl_put_msg(skb, &nlh, cb->nlh->nlmsg_seq,

			id_stats = ibnl_put_msg(skb, &nlh, cb->nlh->nlmsg_seq,

						sizeof *id_stats, RDMA_NL_RDMA_CM,

						sizeof *id_stats, RDMA_NL_RDMA_CM,

						RDMA_NL_RDMA_CM_ID_STATS);

						RDMA_NL_RDMA_CM_ID_STATS,

						NLM_F_MULTI);

			if (!id_stats)

			if (!id_stats)

				goto out;

				goto out;

drivers/infiniband/core/iwpm_msg.c

0 → 100644
+685 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/core/iwpm_util.c

0 → 100644
+607 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE