From cfd36485e2a1786aaa6e83cc79fadf86d4e954ab Mon Sep 17 00:00:00 2001 From: Daniel Borkmann Date: Wed, 24 Apr 2013 23:08:00 +0000 Subject: [PATCH] --- yaml --- r: 369791 b: refs/heads/master c: fdd5f43a1b53a844d04c6eda2cbdbe044b629ae7 h: refs/heads/master i: 369789: fb24bb8eca5d7a2cb4799ace7afb013c34564e8e 369787: 1f4a9bb0387f0f1ea18cd465b8342b40dc88b05a 369783: d06ac30355f53b28431d11bf56214f8eeba95afe 369775: 7773de0a4c6f81980d5485fcf2ed9b8d0fb6857c 369759: 548745c6e70caa875dd83381a04c29485d7de4c2 369727: 07a16dc3dd51b0c98763b19e98d973c059a0113e 369663: d89d10728077823fa46afd52e56ac1bad1ee069e v: v3 --- [refs] | 2 +- trunk/tools/testing/selftests/net/psock_tpacket.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 43f2dffa4ce2..7d4bf0c68157 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 823aa873bc782f1c51b1ce8ec6da7cfcaf93836e +refs/heads/master: fdd5f43a1b53a844d04c6eda2cbdbe044b629ae7 diff --git a/trunk/tools/testing/selftests/net/psock_tpacket.c b/trunk/tools/testing/selftests/net/psock_tpacket.c index a8d7ffadd49b..c41b58640a05 100644 --- a/trunk/tools/testing/selftests/net/psock_tpacket.c +++ b/trunk/tools/testing/selftests/net/psock_tpacket.c @@ -300,7 +300,7 @@ static void walk_v1_v2_rx(int sock, struct ring *ring) static inline int __v1_tx_kernel_ready(struct tpacket_hdr *hdr) { - return ((hdr->tp_status & TP_STATUS_AVAILABLE) == TP_STATUS_AVAILABLE); + return !(hdr->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING)); } static inline void __v1_tx_user_ready(struct tpacket_hdr *hdr) @@ -311,7 +311,7 @@ static inline void __v1_tx_user_ready(struct tpacket_hdr *hdr) static inline int __v2_tx_kernel_ready(struct tpacket2_hdr *hdr) { - return ((hdr->tp_status & TP_STATUS_AVAILABLE) == TP_STATUS_AVAILABLE); + return !(hdr->tp_status & (TP_STATUS_SEND_REQUEST | TP_STATUS_SENDING)); } static inline void __v2_tx_user_ready(struct tpacket2_hdr *hdr)