| Message ID | 1612385537-9076-1-git-send-email-vfedorenko@novek.ru (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] selftests: txtimestamp: fix compilation issue | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | warning | 4 maintainers not CCed: shuah@kernel.org linux-kselftest@vger.kernel.org davem@davemloft.net willemb@google.com |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 7 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
| netdev/stable | success | Stable not CCed |
On Wed, Feb 3, 2021 at 4:11 PM Vadim Fedorenko <vfedorenko@novek.ru> wrote: > > PACKET_TX_TIMESTAMP is defined in if_packet.h but it is not included in > test. But we cannot include it because we have definitions of struct and > including leads to redefinition error. So define PACKET_TX_TIMESTAMP too. The conflicts are with <netpacket/packet.h>. I think it will build if you remove that. > Fixes: 5ef5c90e3cb3 (selftests: move timestamping selftests to net folder) This commit only moved the file. The file was moved twice. Even though it cannot really be applied easily before the move, this goes back to commit 8fe2f761cae9 ("net-timestamp: expand documentation"). > Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> Do you also get the compiler warning about ambiguous control flow? tools/testing/selftests/net/txtimestamp.c:498:6: warning: suggest explicit braces to avoid ambiguous ‘else’ [-Wdangling-else] When touching this file, might be good to also fix that up: - if (cfg_use_pf_packet || cfg_ipproto == IPPROTO_RAW) + if (cfg_use_pf_packet || cfg_ipproto == IPPROTO_RAW) { if (family == PF_INET) total_len += sizeof(struct iphdr); else total_len += sizeof(struct ipv6hdr); + }
On 04.02.2021 13:34, Willem de Bruijn wrote: > On Wed, Feb 3, 2021 at 4:11 PM Vadim Fedorenko <vfedorenko@novek.ru> wrote: >> >> PACKET_TX_TIMESTAMP is defined in if_packet.h but it is not included in >> test. But we cannot include it because we have definitions of struct and >> including leads to redefinition error. So define PACKET_TX_TIMESTAMP too. > > The conflicts are with <netpacket/packet.h>. I think it will build if > you remove that. Good point. I will try to replace the includes. >> Fixes: 5ef5c90e3cb3 (selftests: move timestamping selftests to net folder) > > This commit only moved the file. The file was moved twice. Even though > it cannot really be applied easily before the move, this goes back to > commit 8fe2f761cae9 ("net-timestamp: expand documentation"). Yeah, you are right. Didn't go so deep. >> Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> > > Do you also get the compiler warning about ambiguous control flow? > > tools/testing/selftests/net/txtimestamp.c:498:6: warning: suggest > explicit braces to avoid ambiguous ‘else’ [-Wdangling-else] > > When touching this file, might be good to also fix that up: > > - if (cfg_use_pf_packet || cfg_ipproto == IPPROTO_RAW) > + if (cfg_use_pf_packet || cfg_ipproto == IPPROTO_RAW) { > if (family == PF_INET) > total_len += sizeof(struct iphdr); > else > total_len += sizeof(struct ipv6hdr); > + } > Yes, but skipped it because the main goal was to fix selftests/net build in general and forgot about it later. I will address this warning too. Thanks Willem!
diff --git a/tools/testing/selftests/net/txtimestamp.c b/tools/testing/selftests/net/txtimestamp.c index 490a8cc..2010f47 100644 --- a/tools/testing/selftests/net/txtimestamp.c +++ b/tools/testing/selftests/net/txtimestamp.c @@ -53,6 +53,7 @@ #define NSEC_PER_USEC 1000L #define USEC_PER_SEC 1000000L #define NSEC_PER_SEC 1000000000LL +#define PACKET_TX_TIMESTAMP 16 /* command line parameters */ static int cfg_proto = SOCK_STREAM;
PACKET_TX_TIMESTAMP is defined in if_packet.h but it is not included in test. But we cannot include it because we have definitions of struct and including leads to redefinition error. So define PACKET_TX_TIMESTAMP too. Fixes: 5ef5c90e3cb3 (selftests: move timestamping selftests to net folder) Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> --- tools/testing/selftests/net/txtimestamp.c | 1 + 1 file changed, 1 insertion(+)