| Message ID | 1612461034-24524-1-git-send-email-vfedorenko@novek.ru (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 647b8dd5184665432cc8a2b5bca46a201f690c37 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v4] 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, 28 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 Thu, Feb 4, 2021 at 12:51 PM Vadim Fedorenko <vfedorenko@novek.ru> wrote: > > PACKET_TX_TIMESTAMP is defined in if_packet.h but it is not included in > test. Include it instead of <netpacket/packet.h> otherwise the error of > redefinition arrives. > Also fix the compiler warning about ambiguous control flow by adding > explicit braces. > > Fixes: 8fe2f761cae9 ("net-timestamp: expand documentation") > Suggested-by: Willem de Bruijn <willemdebruijn.kernel@gmail.com> > Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> Acked-by: Willem de Bruijn <willemb@google.com> Thanks for fixing this, Vadim.
Hello: This patch was applied to netdev/net.git (refs/heads/master): On Thu, 4 Feb 2021 20:50:34 +0300 you wrote: > PACKET_TX_TIMESTAMP is defined in if_packet.h but it is not included in > test. Include it instead of <netpacket/packet.h> otherwise the error of > redefinition arrives. > Also fix the compiler warning about ambiguous control flow by adding > explicit braces. > > Fixes: 8fe2f761cae9 ("net-timestamp: expand documentation") > Suggested-by: Willem de Bruijn <willemdebruijn.kernel@gmail.com> > Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> > > [...] Here is the summary with links: - [net,v4] selftests: txtimestamp: fix compilation issue https://git.kernel.org/netdev/net/c/647b8dd51846 You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/tools/testing/selftests/net/txtimestamp.c b/tools/testing/selftests/net/txtimestamp.c index 490a8cc..fabb1d5 100644 --- a/tools/testing/selftests/net/txtimestamp.c +++ b/tools/testing/selftests/net/txtimestamp.c @@ -26,6 +26,7 @@ #include <inttypes.h> #include <linux/errqueue.h> #include <linux/if_ether.h> +#include <linux/if_packet.h> #include <linux/ipv6.h> #include <linux/net_tstamp.h> #include <netdb.h> @@ -34,7 +35,6 @@ #include <netinet/ip.h> #include <netinet/udp.h> #include <netinet/tcp.h> -#include <netpacket/packet.h> #include <poll.h> #include <stdarg.h> #include <stdbool.h> @@ -495,12 +495,12 @@ static void do_test(int family, unsigned int report_opt) total_len = cfg_payload_len; if (cfg_use_pf_packet || cfg_proto == SOCK_RAW) { total_len += sizeof(struct udphdr); - 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); - + } /* special case, only rawv6_sendmsg: * pass proto in sin6_port if not connected * also see ANK comment in net/ipv4/raw.c
PACKET_TX_TIMESTAMP is defined in if_packet.h but it is not included in test. Include it instead of <netpacket/packet.h> otherwise the error of redefinition arrives. Also fix the compiler warning about ambiguous control flow by adding explicit braces. Fixes: 8fe2f761cae9 ("net-timestamp: expand documentation") Suggested-by: Willem de Bruijn <willemdebruijn.kernel@gmail.com> Signed-off-by: Vadim Fedorenko <vfedorenko@novek.ru> --- tools/testing/selftests/net/txtimestamp.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)