FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-16 14:02:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

selftests: psock_tpacket: fix status check

Browse Source 
Testing like this for TP_STATUS_AVAILABLE clearly is a stupid bug
since it always returns true. Fix this by only checking for flags
where the kernel owns the packet and negate this result, since we
also could run into the non-zero status TP_STATUS_WRONG_FORMAT
and need to reclaim frames.

Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Daniel Borkmann 2013-04-24 23:08:00 +00:00 committed by David S. Miller
parent 823aa873bc
commit fdd5f43a1b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/testing/selftests/net/psock_tpacket.c
View File

@ -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) 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) 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) 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) static inline void __v2_tx_user_ready(struct tpacket2_hdr *hdr)