mirrors/scst
1
0
Fork 0
mirror of https://github.com/SCST-project/scst.git synced 2026-05-20 20:21:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

ib_srpt: Linux kernel v4.2 build fix (merge r6423 from trunk)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.0.x@6452 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-07-30 17:33:56 +00:00
parent ad095bd547
commit e276693325
4 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
srpt/Makefile
View File

@@ -77,9 +77,10 @@ endif
OFED_MODULE_SYMVERS:=$(OFED_KERNEL_DIR)/$(MODULE_SYMVERS)
endif
CREATE_SEND_MAD_FLAG = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/create_send_mad PRE_CFLAGS="$(OFED_CFLAGS)" >/dev/null 2>&1 && echo -DCREATE_SEND_MAD_HAS_AH_ARG)
GID_CHANGE_FLAG = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/gid_change PRE_CFLAGS="$(OFED_CFLAGS)" >/dev/null 2>&1 && echo -DHAVE_IB_EVENT_GID_CHANGE)
REGISTER_MAD_AGENT_FLAG = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/register_mad_agent PRE_CFLAGS="$(OFED_CFLAGS) -Werror" >/dev/null 2>&1 && echo -DREGISTER_MAD_AGENT_HAS_FLAGS_ARG)
PRE_CFLAGS=$(OFED_CFLAGS) $(GID_CHANGE_FLAG) $(REGISTER_MAD_AGENT_FLAG) -DOFED_FLAVOR=$(OFED_FLAVOR)
PRE_CFLAGS=$(OFED_CFLAGS) $(CREATE_SEND_MAD_FLAG) $(GID_CHANGE_FLAG) $(REGISTER_MAD_AGENT_FLAG) -DOFED_FLAVOR=$(OFED_FLAVOR)
all: src/$(MODULE_SYMVERS)
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \

3
srpt/conftest/create_send_mad/Makefile Normal file
View File

@@ -0,0 +1,3 @@
LINUXINCLUDE := $(PRE_CFLAGS) $(LINUXINCLUDE)
obj-m += create_send_mad.o

13
srpt/conftest/create_send_mad/create_send_mad.c Normal file
View File

@@ -0,0 +1,13 @@
#include <linux/module.h>
#include <rdma/ib_mad.h>
static int modinit(void)
{
struct ib_mad_send_buf *b;
b = ib_create_send_mad(NULL, 0, 0, NULL, 0, 0, 0, 0);
return b != 0;
}
module_init(modinit);

7
srpt/src/ib_srpt.c
View File

@@ -597,8 +597,11 @@ static void srpt_mad_recv_handler(struct ib_mad_agent *mad_agent,
BUILD_BUG_ON(offsetof(struct ib_dm_mad, data) != IB_MGMT_DEVICE_HDR);
rsp = ib_create_send_mad(mad_agent, mad_wc->wc->src_qp,
mad_wc->wc->pkey_index, 0,
IB_MGMT_DEVICE_HDR, IB_MGMT_DEVICE_DATA,
mad_wc->wc->pkey_index,
#ifdef CREATE_SEND_MAD_HAS_AH_ARG
NULL,
#endif
0, IB_MGMT_DEVICE_HDR, IB_MGMT_DEVICE_DATA,
GFP_KERNEL);
if (IS_ERR(rsp))
goto err_rsp;