public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-18 22:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

selftests/net: replace manual array size calc with ARRAYSIZE macro.

Browse source 
fixes coccinelle WARNING: Use ARRAY_SIZE

Signed-off-by: Mahmoud Maatuq <mahmoudmatook.mm@gmail.com>
Link: https://lore.kernel.org/r/20230716184349.2124858-1-mahmoudmatook.mm@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Mahmoud Maatuq 2023-07-16 22:43:49 +04:00 • committed by Jakub Kicinski
parent 4a59cdfd66
commit 3645c71b58
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/testing/selftests/net/Makefile
View file

@ -3,6 +3,8 @@
CFLAGS = -Wall -Wl,--no-as-needed -O2 -g CFLAGS = -Wall -Wl,--no-as-needed -O2 -g
CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES) CFLAGS += -I../../../../usr/include/ $(KHDR_INCLUDES)
# Additional include paths needed by kselftest.h
CFLAGS += -I../
TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \ TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh \
rtnetlink.sh xfrm_policy.sh test_blackhole_dev.sh rtnetlink.sh xfrm_policy.sh test_blackhole_dev.sh

6
tools/testing/selftests/net/csum.c
View file

@ -91,6 +91,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#include "kselftest.h"
static bool cfg_bad_csum; static bool cfg_bad_csum;
static int cfg_family = PF_INET6; static int cfg_family = PF_INET6;
static int cfg_num_pkt = 4; static int cfg_num_pkt = 4;
@ -450,7 +452,7 @@ static void send_packet(int fd, const char *buf, int len)
iov[2].iov_len = len; iov[2].iov_len = len;
msg.msg_iov = iov; msg.msg_iov = iov;
msg.msg_iovlen = sizeof(iov) / sizeof(iov[0]); msg.msg_iovlen = ARRAY_SIZE(iov);
msg.msg_name = &addr; msg.msg_name = &addr;
msg.msg_namelen = sizeof(addr); msg.msg_namelen = sizeof(addr);
@ -505,7 +507,7 @@ static void __recv_prepare_packet_filter(int fd, int off_nexthdr, int off_dport)
struct sock_fprog prog = {}; struct sock_fprog prog = {};
prog.filter = filter; prog.filter = filter;
prog.len = sizeof(filter) / sizeof(struct sock_filter); prog.len = ARRAY_SIZE(filter);
if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog))) if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &prog, sizeof(prog)))
error(1, errno, "setsockopt filter"); error(1, errno, "setsockopt filter");
} }

6
tools/testing/selftests/net/hwtstamp_config.c
View file

@ -16,6 +16,8 @@
#include <linux/net_tstamp.h> #include <linux/net_tstamp.h>
#include <linux/sockios.h> #include <linux/sockios.h>
#include "kselftest.h"
static int static int
lookup_value(const char **names, int size, const char *name) lookup_value(const char **names, int size, const char *name)
{ {
@ -50,7 +52,7 @@ static const char *tx_types[] = {
TX_TYPE(ONESTEP_SYNC) TX_TYPE(ONESTEP_SYNC)
#undef TX_TYPE #undef TX_TYPE
}; };
#define N_TX_TYPES ((int)(sizeof(tx_types) / sizeof(tx_types[0]))) #define N_TX_TYPES ((int)(ARRAY_SIZE(tx_types)))
static const char *rx_filters[] = { static const char *rx_filters[] = {
#define RX_FILTER(name) [HWTSTAMP_FILTER_ ## name] = #name #define RX_FILTER(name) [HWTSTAMP_FILTER_ ## name] = #name
@ -71,7 +73,7 @@ static const char *rx_filters[] = {
RX_FILTER(PTP_V2_DELAY_REQ), RX_FILTER(PTP_V2_DELAY_REQ),
#undef RX_FILTER #undef RX_FILTER
}; };
#define N_RX_FILTERS ((int)(sizeof(rx_filters) / sizeof(rx_filters[0]))) #define N_RX_FILTERS ((int)(ARRAY_SIZE(rx_filters)))
static void usage(void) static void usage(void)
{ {

4
tools/testing/selftests/net/psock_lib.h
View file

@ -14,6 +14,8 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <unistd.h> #include <unistd.h>
#include "kselftest.h"
#define DATA_LEN 100 #define DATA_LEN 100
#define DATA_CHAR 'a' #define DATA_CHAR 'a'
#define DATA_CHAR_1 'b' #define DATA_CHAR_1 'b'
@ -63,7 +65,7 @@ static __maybe_unused void pair_udp_setfilter(int fd)
struct sock_fprog bpf_prog; struct sock_fprog bpf_prog;
bpf_prog.filter = bpf_filter; bpf_prog.filter = bpf_filter;
bpf_prog.len = sizeof(bpf_filter) / sizeof(struct sock_filter); bpf_prog.len = ARRAY_SIZE(bpf_filter);
if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &bpf_prog, if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &bpf_prog,
sizeof(bpf_prog))) { sizeof(bpf_prog))) {