diff options
| author |   Willem de Bruijn <willemb@google.com> | 2013-03-21 14:10:03 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-03-21 14:31:36 -0400 |
| commit | 98e821a2a927b6dc0f7adc4b64ad29bec1b6ff89 (patch) | |
| tree | 8844d59f60b08ba86bd60e7395e121d1b7e1385a | |
| parent | netlink: Diag core and basic socket info dumping (v2) (diff) | |
| download | linux-dev-98e821a2a927b6dc0f7adc4b64ad29bec1b6ff89.tar.xz linux-dev-98e821a2a927b6dc0f7adc4b64ad29bec1b6ff89.zip | |
net: fix psock_fanout on sparc64
The packetsocket fanout test uses a packet ring. Use TPACKET_V2
instead of TPACKET_V1 to work around a known 32/64 bit issue in
the older ring that manifests on sparc64.
Signed-off-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | tools/testing/selftests/net/psock_fanout.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/testing/selftests/net/psock_fanout.c b/tools/testing/selftests/net/psock_fanout.c index 226e5e33105a..59bd6367af71 100644 --- a/tools/testing/selftests/net/psock_fanout.c +++ b/tools/testing/selftests/net/psock_fanout.c @@ -182,7 +182,13 @@ static char *sock_fanout_open_ring(int fd) .tp_frame_nr = RING_NUM_FRAMES, }; char *ring; + int val = TPACKET_V2; + if (setsockopt(fd, SOL_PACKET, PACKET_VERSION, (void *) &val, + sizeof(val))) { + perror("packetsock ring setsockopt version"); + exit(1); + } if (setsockopt(fd, SOL_PACKET, PACKET_RX_RING, (void *) &req, sizeof(req))) { perror("packetsock ring setsockopt"); @@ -201,7 +207,7 @@ static char *sock_fanout_open_ring(int fd) static int sock_fanout_read_ring(int fd, void *ring) { - struct tpacket_hdr *header = ring; + struct tpacket2_hdr *header = ring; int count = 0; while (header->tp_status & TP_STATUS_USER && count < RING_NUM_FRAMES) { |