Commit b55cc611 authored by Mike Maloney's avatar Mike Maloney Committed by Khalid Elmously

selftests/net: cleanup unused parameter in psock_fanout

BugLink: https://bugs.launchpad.net/bugs/1853375

sock_fanout_open no longer sets the size of packet_socket ring, so stop
passing the parameter.
Signed-off-by: default avatarMike Maloney <maloney@google.com>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
(cherry picked from commit 2e7a7217)
Signed-off-by: default avatarPo-Hsu Lin <po-hsu.lin@canonical.com>
Acked-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Acked-by: default avatarStefan Bader <stefan.bader@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent faf36efc
...@@ -71,7 +71,7 @@ ...@@ -71,7 +71,7 @@
/* Open a socket in a given fanout mode. /* Open a socket in a given fanout mode.
* @return -1 if mode is bad, a valid socket otherwise */ * @return -1 if mode is bad, a valid socket otherwise */
static int sock_fanout_open(uint16_t typeflags, int num_packets) static int sock_fanout_open(uint16_t typeflags)
{ {
int fd, val; int fd, val;
...@@ -211,7 +211,7 @@ static void test_control_single(void) ...@@ -211,7 +211,7 @@ static void test_control_single(void)
fprintf(stderr, "test: control single socket\n"); fprintf(stderr, "test: control single socket\n");
if (sock_fanout_open(PACKET_FANOUT_ROLLOVER | if (sock_fanout_open(PACKET_FANOUT_ROLLOVER |
PACKET_FANOUT_FLAG_ROLLOVER, 0) != -1) { PACKET_FANOUT_FLAG_ROLLOVER) != -1) {
fprintf(stderr, "ERROR: opened socket with dual rollover\n"); fprintf(stderr, "ERROR: opened socket with dual rollover\n");
exit(1); exit(1);
} }
...@@ -224,26 +224,26 @@ static void test_control_group(void) ...@@ -224,26 +224,26 @@ static void test_control_group(void)
fprintf(stderr, "test: control multiple sockets\n"); fprintf(stderr, "test: control multiple sockets\n");
fds[0] = sock_fanout_open(PACKET_FANOUT_HASH, 20); fds[0] = sock_fanout_open(PACKET_FANOUT_HASH);
if (fds[0] == -1) { if (fds[0] == -1) {
fprintf(stderr, "ERROR: failed to open HASH socket\n"); fprintf(stderr, "ERROR: failed to open HASH socket\n");
exit(1); exit(1);
} }
if (sock_fanout_open(PACKET_FANOUT_HASH | if (sock_fanout_open(PACKET_FANOUT_HASH |
PACKET_FANOUT_FLAG_DEFRAG, 10) != -1) { PACKET_FANOUT_FLAG_DEFRAG) != -1) {
fprintf(stderr, "ERROR: joined group with wrong flag defrag\n"); fprintf(stderr, "ERROR: joined group with wrong flag defrag\n");
exit(1); exit(1);
} }
if (sock_fanout_open(PACKET_FANOUT_HASH | if (sock_fanout_open(PACKET_FANOUT_HASH |
PACKET_FANOUT_FLAG_ROLLOVER, 10) != -1) { PACKET_FANOUT_FLAG_ROLLOVER) != -1) {
fprintf(stderr, "ERROR: joined group with wrong flag ro\n"); fprintf(stderr, "ERROR: joined group with wrong flag ro\n");
exit(1); exit(1);
} }
if (sock_fanout_open(PACKET_FANOUT_CPU, 10) != -1) { if (sock_fanout_open(PACKET_FANOUT_CPU) != -1) {
fprintf(stderr, "ERROR: joined group with wrong mode\n"); fprintf(stderr, "ERROR: joined group with wrong mode\n");
exit(1); exit(1);
} }
fds[1] = sock_fanout_open(PACKET_FANOUT_HASH, 20); fds[1] = sock_fanout_open(PACKET_FANOUT_HASH);
if (fds[1] == -1) { if (fds[1] == -1) {
fprintf(stderr, "ERROR: failed to join group\n"); fprintf(stderr, "ERROR: failed to join group\n");
exit(1); exit(1);
...@@ -264,8 +264,8 @@ static int test_datapath(uint16_t typeflags, int port_off, ...@@ -264,8 +264,8 @@ static int test_datapath(uint16_t typeflags, int port_off,
fprintf(stderr, "test: datapath 0x%hx\n", typeflags); fprintf(stderr, "test: datapath 0x%hx\n", typeflags);
fds[0] = sock_fanout_open(typeflags, 20); fds[0] = sock_fanout_open(typeflags);
fds[1] = sock_fanout_open(typeflags, 20); fds[1] = sock_fanout_open(typeflags);
if (fds[0] == -1 || fds[1] == -1) { if (fds[0] == -1 || fds[1] == -1) {
fprintf(stderr, "ERROR: failed open\n"); fprintf(stderr, "ERROR: failed open\n");
exit(1); exit(1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment