---

yaml --- r: 369791 b: refs/heads/master c: fdd5f43 h: refs/heads/master i: 369789: fb24bb8 369787: 1f4a9bb 369783: d06ac30 369775: 7773de0 369759: 548745c 369727: 07a16dc 369663: d89d107 v: v3
git-mirror · Apr 29, 2013 · cfd3648 · cfd3648
1 parent ede54b6
commit cfd3648
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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)