Merged revisions 6779-6780 via svnmerge from

svn+ssh://svn.code.sf.net/p/scst/svn/trunk

........
  r6779 | bvassche | 2016-01-19 10:08:04 -0800 (Tue, 19 Jan 2016) | 1 line
  
  nightly build: Add kernel 4.4 support files
........
  r6780 | bvassche | 2016-01-19 10:08:36 -0800 (Tue, 19 Jan 2016) | 1 line
  
  ib_srpt: Fix in-tree build for kernel v4.4
........


git-svn-id: http://svn.code.sf.net/p/scst/svn/branches/3.1.x@6781 d57e44dd-8a1f-0410-8b47-8ef2f437770f
This commit is contained in:
Bart Van Assche
2016-01-19 21:02:08 +00:00
parent ade8c1ba37
commit 776c221d2e
7 changed files with 65 additions and 1 deletions
+2 -1
View File
@@ -694,7 +694,8 @@ static int srpt_refresh_port(struct srpt_port *sport)
sport->lid = port_attr.lid;
ret = ib_query_gid(sport->sdev->device, sport->port, 0, &sport->gid
#ifdef IB_QUERY_GID_HAS_ATTR_ARG
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0) || \
defined(IB_QUERY_GID_HAS_ATTR_ARG)
, NULL
#endif
);