From: Marc Dionne Date: Wed, 8 Jul 2015 17:32:31 +0000 (-0300) Subject: Linux 4.2: Pass namespace to sock_create_kern X-Git-Tag: upstream/1.6.15^2~9 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=8d1e5a497635bf453c73525b9df2bcf9c13a5faf;p=packages%2Fo%2Fopenafs.git Linux 4.2: Pass namespace to sock_create_kern sock_create_kern gains an additional network namespace argument. Pass in the default system namesapce. Reviewed-on: http://gerrit.openafs.org/11925 Tested-by: BuildBot Reviewed-by: Perry Ruiter Reviewed-by: Chas Williams <3chas3@gmail.com> Reviewed-by: Benjamin Kaduk Reviewed-by: Jeffrey Altman (cherry picked from commit e597b879677d023165298adadfb88db031883ff4) Change-Id: I8e4341a6b4c33c5226b9307827932f577e08d5b2 Reviewed-on: http://gerrit.openafs.org/11948 Tested-by: BuildBot Reviewed-by: Benjamin Kaduk Reviewed-by: Stephan Wiesand --- diff --git a/acinclude.m4 b/acinclude.m4 index 79df95afb..0d1bb613f 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -989,6 +989,9 @@ case $AFS_SYSNAME in *_linux* | *_umlinux*) AC_CHECK_LINUX_FUNC([sock_create_kern], [#include ], [sock_create_kern(0, 0, 0, NULL);]) + AC_CHECK_LINUX_FUNC([sock_create_kern_ns], + [#include ], + [sock_create_kern(NULL, 0, 0, 0, NULL);]) AC_CHECK_LINUX_FUNC([splice_direct_to_actor], [#include ], [splice_direct_to_actor(NULL,NULL,NULL);]) diff --git a/src/rx/LINUX/rx_knet.c b/src/rx/LINUX/rx_knet.c index 3f7f2bc1e..1a5cfdefa 100644 --- a/src/rx/LINUX/rx_knet.c +++ b/src/rx/LINUX/rx_knet.c @@ -42,7 +42,9 @@ rxk_NewSocketHost(afs_uint32 ahost, short aport) int pmtu = IP_PMTUDISC_DONT; #endif -#ifdef HAVE_LINUX_SOCK_CREATE_KERN +#ifdef HAVE_LINUX_SOCK_CREATE_KERN_NS + code = sock_create_kern(&init_net, AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp); +#elif defined(HAVE_LINUX_SOCK_CREATE_KERN) code = sock_create_kern(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp); #elif defined(LINUX_KERNEL_SOCK_CREATE_V) code = sock_create(AF_INET, SOCK_DGRAM, IPPROTO_UDP, &sockp, 0);