From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933903AbcLMPKN (ORCPT ); Tue, 13 Dec 2016 10:10:13 -0500 Received: from bombadil.infradead.org ([198.137.202.9]:41999 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933800AbcLMPJ5 (ORCPT ); Tue, 13 Dec 2016 10:09:57 -0500 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, Joe Stringer , Alexei Starovoitov , Daniel Borkmann , Wang Nan , Arnaldo Carvalho de Melo Subject: [PATCH 14/22] samples/bpf: Move open_raw_sock to separate header Date: Tue, 13 Dec 2016 12:09:20 -0300 Message-Id: <20161213150928.13144-15-acme@kernel.org> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161213150928.13144-1-acme@kernel.org> References: <20161213150928.13144-1-acme@kernel.org> X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Joe Stringer This function was declared in libbpf.c and was the only remaining function in this library, but has nothing to do with BPF. Shift it out into a new header, sock_example.h, and include it from the relevant samples. Signed-off-by: Joe Stringer Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Wang Nan Link: http://lkml.kernel.org/r/20161209024620.31660-8-joe@ovn.org Signed-off-by: Arnaldo Carvalho de Melo --- samples/bpf/Makefile | 2 +- samples/bpf/fds_example.c | 1 + samples/bpf/libbpf.h | 3 --- samples/bpf/sock_example.c | 1 + samples/bpf/{libbpf.c => sock_example.h} | 3 +-- samples/bpf/sockex1_user.c | 1 + samples/bpf/sockex2_user.c | 1 + samples/bpf/sockex3_user.c | 1 + 8 files changed, 7 insertions(+), 6 deletions(-) rename samples/bpf/{libbpf.c => sock_example.h} (92%) diff --git a/samples/bpf/Makefile b/samples/bpf/Makefile index 0bcc3906361b..9ffa6a2c061d 100644 --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@ -30,7 +30,7 @@ hostprogs-y += sampleip hostprogs-y += tc_l2_redirect # Libbpf dependencies -LIBBPF := libbpf.o ../../tools/lib/bpf/bpf.o +LIBBPF := ../../tools/lib/bpf/bpf.o test_verifier-objs := test_verifier.o $(LIBBPF) test_maps-objs := test_maps.o $(LIBBPF) diff --git a/samples/bpf/fds_example.c b/samples/bpf/fds_example.c index 4ffd8f340496..7ae3b19f5c42 100644 --- a/samples/bpf/fds_example.c +++ b/samples/bpf/fds_example.c @@ -14,6 +14,7 @@ #include "bpf_load.h" #include "libbpf.h" +#include "sock_example.h" #define BPF_F_PIN (1 << 0) #define BPF_F_GET (1 << 1) diff --git a/samples/bpf/libbpf.h b/samples/bpf/libbpf.h index 09aedc320009..3705fba453a0 100644 --- a/samples/bpf/libbpf.h +++ b/samples/bpf/libbpf.h @@ -185,7 +185,4 @@ struct bpf_insn; .off = 0, \ .imm = 0 }) -/* create RAW socket and bind to interface 'name' */ -int open_raw_sock(const char *name); - #endif diff --git a/samples/bpf/sock_example.c b/samples/bpf/sock_example.c index 7ab636c30154..bb418fd0a1f2 100644 --- a/samples/bpf/sock_example.c +++ b/samples/bpf/sock_example.c @@ -27,6 +27,7 @@ #include #include #include "libbpf.h" +#include "sock_example.h" static int test_sock(void) { diff --git a/samples/bpf/libbpf.c b/samples/bpf/sock_example.h similarity index 92% rename from samples/bpf/libbpf.c rename to samples/bpf/sock_example.h index bee473a494f1..09f7fe7e5fd7 100644 --- a/samples/bpf/libbpf.c +++ b/samples/bpf/sock_example.h @@ -1,4 +1,3 @@ -/* eBPF mini library */ #include #include #include @@ -11,7 +10,7 @@ #include #include "libbpf.h" -int open_raw_sock(const char *name) +static inline int open_raw_sock(const char *name) { struct sockaddr_ll sll; int sock; diff --git a/samples/bpf/sockex1_user.c b/samples/bpf/sockex1_user.c index 2956d893d732..5cdddc5c9015 100644 --- a/samples/bpf/sockex1_user.c +++ b/samples/bpf/sockex1_user.c @@ -3,6 +3,7 @@ #include #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include #include diff --git a/samples/bpf/sockex2_user.c b/samples/bpf/sockex2_user.c index c43958a67cca..7ae4e2e5cf3a 100644 --- a/samples/bpf/sockex2_user.c +++ b/samples/bpf/sockex2_user.c @@ -3,6 +3,7 @@ #include #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include #include #include diff --git a/samples/bpf/sockex3_user.c b/samples/bpf/sockex3_user.c index 2cb9011ea440..a100cf6c95bb 100644 --- a/samples/bpf/sockex3_user.c +++ b/samples/bpf/sockex3_user.c @@ -3,6 +3,7 @@ #include #include "libbpf.h" #include "bpf_load.h" +#include "sock_example.h" #include #include #include -- 2.9.3