diff options
| author |   Chris Zankel <chris@zankel.net> | 2014-12-15 20:09:06 -0800 |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2014-12-15 20:09:06 -0800 |
| commit | 865566ed33f08637c3486b4d301e96a9064ad2eb (patch) | |
| tree | dfa26622c8feaa57153d87d207133f01aff5858b /tools | |
| parent | Merge tag 'xtensa-for-next-20141021-2' of git://github.com/jcmvbkbc/linux-xtensa into for_next (diff) | |
| parent | Linux 3.18 (diff) | |
| download | wireguard-linux-865566ed33f08637c3486b4d301e96a9064ad2eb.tar.xz wireguard-linux-865566ed33f08637c3486b4d301e96a9064ad2eb.zip | |
Merge tag 'v3.18' into for_next
Linux 3.18
Diffstat (limited to '')
| -rw-r--r-- | tools/testing/selftests/net/psock_fanout.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/net/psock_fanout.c b/tools/testing/selftests/net/psock_fanout.c index 57b9c2b7c4ff..6f6733331d95 100644 --- a/tools/testing/selftests/net/psock_fanout.c +++ b/tools/testing/selftests/net/psock_fanout.c @@ -128,7 +128,7 @@ static int sock_fanout_read_ring(int fd, void *ring) struct tpacket2_hdr *header = ring; int count = 0; - while (header->tp_status & TP_STATUS_USER && count < RING_NUM_FRAMES) { + while (count < RING_NUM_FRAMES && header->tp_status & TP_STATUS_USER) { count++; header = ring + (count * getpagesize()); } |