ib_srpt: Port to MOFED 3.0

git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@6497 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2015-09-08 16:18:27 +00:00
parent 2b5c929181
commit 68ce2d0ce4
4 changed files with 21 additions and 4 deletions

View File

@@ -84,7 +84,8 @@ ifeq ($(CREATE_SEND_MAD_AH_FLAG),)
endif
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) $(CREATE_CQ_FLAG) $(CREATE_SEND_MAD_AH_FLAG) $(CREATE_SEND_MAD_BASE_FLAG) $(GID_CHANGE_FLAG) $(REGISTER_MAD_AGENT_FLAG) -DOFED_FLAVOR=$(OFED_FLAVOR)
QUERY_GID_FLAG = $(shell $(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/conftest/query_gid PRE_CFLAGS="$(OFED_CFLAGS)" >/dev/null 2>&1 && echo -DIB_QUERY_GID_HAS_ATTR_ARG)
PRE_CFLAGS=$(OFED_CFLAGS) $(CREATE_CQ_FLAG) $(CREATE_SEND_MAD_AH_FLAG) $(CREATE_SEND_MAD_BASE_FLAG) $(GID_CHANGE_FLAG) $(REGISTER_MAD_AGENT_FLAG) $(QUERY_GID_FLAG) -DOFED_FLAVOR=$(OFED_FLAVOR)
all: src/$(MODULE_SYMVERS)
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/src \
@@ -137,11 +138,11 @@ src/$(MODULE_SYMVERS): $(SCST_SYMVERS_DIR)/$(MODULE_SYMVERS) \
fi
clean:
for d in conftest/gid_change conftest/register_mad_agent src; do \
rm -rf conftest/pre_cflags conftest/kcflags
for d in conftest/* src; do \
$(MAKE) -C $(KDIR) SUBDIRS=$(shell pwd)/$$d clean; \
done
rm -f src/$(MODULE_SYMVERS) src/Module.markers src/modules.order
rm -rf conftest/pre_cflags conftest/kcflags
extraclean: clean
rm -f *.orig *.rej

View File

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

View File

@@ -0,0 +1,9 @@
#include <linux/module.h>
#include <rdma/ib_verbs.h>
static int modinit(void)
{
return ib_query_gid(NULL, 0, 0, NULL, NULL);
}
module_init(modinit);

View File

@@ -701,7 +701,11 @@ static int srpt_refresh_port(struct srpt_port *sport)
sport->sm_lid = port_attr.sm_lid;
sport->lid = port_attr.lid;
ret = ib_query_gid(sport->sdev->device, sport->port, 0, &sport->gid);
ret = ib_query_gid(sport->sdev->device, sport->port, 0, &sport->gid
#ifdef IB_QUERY_GID_HAS_ATTR_ARG
, NULL
#endif
);
if (ret)
goto err_query_port;