2019-01-25 02:47:54

by Yue Haibing

Subject: [PATCH -next] selftests: bpf: remove duplicated include

Remove duplicated include.

Signed-off-by: YueHaibing <[email protected]>
---
tools/testing/selftests/bpf/test_flow_dissector.c | 2 --
tools/testing/selftests/bpf/test_maps.c | 1 -
tools/testing/selftests/bpf/test_sockmap.c | 1 -
3 files changed, 4 deletions(-)

diff --git a/tools/testing/selftests/bpf/test_flow_dissector.c b/tools/testing/selftests/bpf/test_flow_dissector.c
index 12b784a..01f0c63 100644
--- a/tools/testing/selftests/bpf/test_flow_dissector.c
+++ b/tools/testing/selftests/bpf/test_flow_dissector.c
@@ -16,7 +16,6 @@
#include <errno.h>
#include <linux/if_packet.h>
#include <linux/if_ether.h>
-#include <linux/if_packet.h>
#include <linux/ipv6.h>
#include <netinet/ip.h>
#include <netinet/in.h>
@@ -25,7 +24,6 @@
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
-#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
index e2b9eee..1dfef77 100644
--- a/tools/testing/selftests/bpf/test_maps.c
+++ b/tools/testing/selftests/bpf/test_maps.c
@@ -633,7 +633,6 @@ static void test_stackmap(int task, void *data)
close(fd);
}

-#include <sys/socket.h>
#include <sys/ioctl.h>
#include <arpa/inet.h>
#include <sys/select.h>
diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
index e85a771..3845144 100644
--- a/tools/testing/selftests/bpf/test_sockmap.c
+++ b/tools/testing/selftests/bpf/test_sockmap.c
@@ -10,7 +10,6 @@
#include <unistd.h>
#include <string.h>
#include <errno.h>
-#include <sys/ioctl.h>
#include <stdbool.h>
#include <signal.h>
#include <fcntl.h>
--
2.7.0

2019-01-25 23:01:44

by Song Liu

Subject: Re: [PATCH -next] selftests: bpf: remove duplicated include

On Thu, Jan 24, 2019 at 6:49 PM YueHaibing <[email protected]> wrote:
>
> Remove duplicated include.
>
> Signed-off-by: YueHaibing <[email protected]>

Acked-by: Song Liu <[email protected]>

Thanks!

> ---
> tools/testing/selftests/bpf/test_flow_dissector.c | 2 --
> tools/testing/selftests/bpf/test_maps.c | 1 -
> tools/testing/selftests/bpf/test_sockmap.c | 1 -
> 3 files changed, 4 deletions(-)
>
> diff --git a/tools/testing/selftests/bpf/test_flow_dissector.c b/tools/testing/selftests/bpf/test_flow_dissector.c
> index 12b784a..01f0c63 100644
> --- a/tools/testing/selftests/bpf/test_flow_dissector.c
> +++ b/tools/testing/selftests/bpf/test_flow_dissector.c
> @@ -16,7 +16,6 @@
> #include <errno.h>
> #include <linux/if_packet.h>
> #include <linux/if_ether.h>
> -#include <linux/if_packet.h>
> #include <linux/ipv6.h>
> #include <netinet/ip.h>
> #include <netinet/in.h>
> @@ -25,7 +24,6 @@
> #include <stdbool.h>
> #include <stdlib.h>
> #include <stdio.h>
> -#include <stdlib.h>
> #include <string.h>
> #include <sys/ioctl.h>
> #include <sys/socket.h>
> diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c
> index e2b9eee..1dfef77 100644
> --- a/tools/testing/selftests/bpf/test_maps.c
> +++ b/tools/testing/selftests/bpf/test_maps.c
> @@ -633,7 +633,6 @@ static void test_stackmap(int task, void *data)
> close(fd);
> }
>
> -#include <sys/socket.h>
> #include <sys/ioctl.h>
> #include <arpa/inet.h>
> #include <sys/select.h>
> diff --git a/tools/testing/selftests/bpf/test_sockmap.c b/tools/testing/selftests/bpf/test_sockmap.c
> index e85a771..3845144 100644
> --- a/tools/testing/selftests/bpf/test_sockmap.c
> +++ b/tools/testing/selftests/bpf/test_sockmap.c
> @@ -10,7 +10,6 @@
> #include <unistd.h>
> #include <string.h>
> #include <errno.h>
> -#include <sys/ioctl.h>
> #include <stdbool.h>
> #include <signal.h>
> #include <fcntl.h>
> --
> 2.7.0
>
>

2019-01-28 23:27:19

by Daniel Borkmann

Subject: Re: [PATCH -next] selftests: bpf: remove duplicated include

On 01/25/2019 03:46 AM, YueHaibing wrote:
> Remove duplicated include.
>
> Signed-off-by: YueHaibing <[email protected]>

Applied, thanks!