From 85687aac517dfc40053a1be1eca326185f819919 Mon Sep 17 00:00:00 2001
From: Willem de Bruijn <willemb@google.com>
Date: Thu, 21 Mar 2013 14:10:03 -0400
Subject: [PATCH] --- yaml --- r: 368591 b: refs/heads/master c:
 98e821a2a927b6dc0f7adc4b64ad29bec1b6ff89 h: refs/heads/master i:   368589:
 b5cb0c674a603d297317e76b4076d2027390e3ab   368587:
 f1fc51a183fc656edff25514c3e3a45a7b981230   368583:
 49724dfa554dba0d80b159f78b13bf8f5494cfd8   368575:
 bb9b152472397311023535d85c36cf87ab35761d v: v3

---
 [refs]                                           | 2 +-
 trunk/tools/testing/selftests/net/psock_fanout.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 898a38cfad81..2494bf31b1da 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eaaa31392690c7609f7afeec5ba38a79d009842d
+refs/heads/master: 98e821a2a927b6dc0f7adc4b64ad29bec1b6ff89
diff --git a/trunk/tools/testing/selftests/net/psock_fanout.c b/trunk/tools/testing/selftests/net/psock_fanout.c
index 226e5e33105a..59bd6367af71 100644
--- a/trunk/tools/testing/selftests/net/psock_fanout.c
+++ b/trunk/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) {