From 7da308e1c4ce8a262d8744a1f8e09ddc025c1312 Mon Sep 17 00:00:00 2001 From: James Simmons Date: Mon, 8 Jun 2015 22:27:07 -0400 Subject: [PATCH] staging:lustre: move tcpip abstraction Rename libcfs/linux/linux-tcpip.c to lnet/lnet/lib-socket.c Signed-off-by: James Simmons Signed-off-by: Greg Kroah-Hartman --- drivers/staging/lustre/lnet/lnet/Makefile | 7 ++++--- .../libcfs/linux/linux-tcpip.c => lnet/lnet/lib-socket.c} | 3 ++- drivers/staging/lustre/lustre/libcfs/Makefile | 1 - 3 files changed, 6 insertions(+), 5 deletions(-) rename drivers/staging/lustre/{lustre/libcfs/linux/linux-tcpip.c => lnet/lnet/lib-socket.c} (99%) diff --git a/drivers/staging/lustre/lnet/lnet/Makefile b/drivers/staging/lustre/lnet/lnet/Makefile index 336b8ea4fdf6..52492fb10f85 100644 --- a/drivers/staging/lustre/lnet/lnet/Makefile +++ b/drivers/staging/lustre/lnet/lnet/Makefile @@ -1,5 +1,6 @@ obj-$(CONFIG_LNET) += lnet.o -lnet-y := api-ni.o config.o lib-me.o lib-msg.o lib-eq.o \ - lib-md.o lib-ptl.o lib-move.o module.o lo.o router.o \ - router_proc.o acceptor.o peer.o +lnet-y := api-ni.o config.o \ + lib-me.o lib-msg.o lib-eq.o lib-md.o lib-ptl.o \ + lib-socket.o lib-move.o module.o lo.o \ + router.o router_proc.o acceptor.o peer.o diff --git a/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c b/drivers/staging/lustre/lnet/lnet/lib-socket.c similarity index 99% rename from drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c rename to drivers/staging/lustre/lnet/lnet/lib-socket.c index f2462e7f04bc..7f80612cd3e5 100644 --- a/drivers/staging/lustre/lustre/libcfs/linux/linux-tcpip.c +++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c @@ -35,7 +35,8 @@ */ #define DEBUG_SUBSYSTEM S_LNET -#include "../../../include/linux/libcfs/libcfs.h" +#include "../../include/linux/libcfs/libcfs.h" +#include "../../include/linux/lnet/lib-lnet.h" #include #include diff --git a/drivers/staging/lustre/lustre/libcfs/Makefile b/drivers/staging/lustre/lustre/libcfs/Makefile index fabdd3e5de9e..ec98f44a10dd 100644 --- a/drivers/staging/lustre/lustre/libcfs/Makefile +++ b/drivers/staging/lustre/lustre/libcfs/Makefile @@ -2,7 +2,6 @@ obj-$(CONFIG_LUSTRE_FS) += libcfs.o libcfs-linux-objs := linux-tracefile.o linux-debug.o libcfs-linux-objs += linux-prim.o linux-cpu.o -libcfs-linux-objs += linux-tcpip.o libcfs-linux-objs += linux-curproc.o libcfs-linux-objs += linux-module.o libcfs-linux-objs += linux-crypto.o -- 2.34.1