Commit 1329e40e authored by Shuah Khan's avatar Shuah Khan
Browse files

selftests/net: remove ARRAY_SIZE define from individual tests 



ARRAY_SIZE is defined in several selftests. Remove definitions from
individual test files and include header file for the define instead.
ARRAY_SIZE define is added in a separate patch to prepare for this
change.

Remove ARRAY_SIZE from net tests and pickup the one defined in
kselftest.h.

Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent 5a69d33b

tools/testing/selftests/net/gro.c

+2 −1
Original line number Diff line number Diff line
@@ -57,10 +57,11 @@ 
#include <string.h>

#include <unistd.h>



#include "../kselftest.h"



#define DPORT 8000

#define SPORT 1500

#define PAYLOAD_LEN 100

#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

#define NUM_PACKETS 4

#define START_SEQ 100

#define START_ACK 100

tools/testing/selftests/net/ipsec.c

+0 −1
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 


#define pr_err(fmt, ...)	printk(fmt ": %m", ##__VA_ARGS__)



#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

#define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))



#define IPV4_STR_SZ	16	/* xxx.xxx.xxx.xxx is longest + \0 */

tools/testing/selftests/net/reuseport_bpf.c

+1 −3
Original line number Diff line number Diff line
@@ -24,9 +24,7 @@ 
#include <sys/resource.h>

#include <unistd.h>



#ifndef ARRAY_SIZE

#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

#endif

#include "../kselftest.h"



struct test_params {

	int recv_family;

tools/testing/selftests/net/rxtimestamp.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/net_tstamp.h>

#include <linux/errqueue.h>



#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

#include "../kselftest.h"



struct options {

	int so_timestamp;

tools/testing/selftests/net/socket.c

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
#include <sys/socket.h>

#include <netinet/in.h>



#include "../kselftest.h"



struct socket_testcase {

	int	domain;

	int	type;
@@ -31,7 +33,6 @@ static struct socket_testcase tests[] = { 
	{ AF_INET, SOCK_STREAM, IPPROTO_UDP, -EPROTONOSUPPORT, 1  },

};



#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))

#define ERR_STRING_SZ	64



static int run_tests(void)