]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
selftests/net: timestamping: Fix bind_phc check
authorGerhard Engleder <gerhard@engleder-embedded.com>
Sun, 30 Jan 2022 09:54:22 +0000 (10:54 +0100)
committerStefan Bader <stefan.bader@canonical.com>
Wed, 27 Apr 2022 09:57:30 +0000 (11:57 +0200)
BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit 678dfd5280341d877ca646499bfdc82a3d8b4356 ]

timestamping checks socket options during initialisation. For the field
bind_phc of the socket option SO_TIMESTAMPING it expects the value -1 if
PHC is not bound. Actually the value of bind_phc is 0 if PHC is not
bound. This results in the following output:

SIOCSHWTSTAMP: tx_type 0 requested, got 0; rx_filter 0 requested, got 0
SO_TIMESTAMP 0
SO_TIMESTAMPNS 0
SO_TIMESTAMPING flags 0, bind phc 0
   not expected, flags 0, bind phc -1

This is fixed by setting default value and expected value of bind_phc to
0.

Fixes: 2214d7032479 ("selftests/net: timestamping: support binding PHC")
Signed-off-by: Gerhard Engleder <gerhard@engleder-embedded.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit 7ad4f7729f0efcb72c04d5f852236d6c774842d3)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
tools/testing/selftests/net/timestamping.c

index aee631c5284eb54f8243297fb51e8e70d5c7b88b..044bc0e9ed81aa3b96751c99627710545e3d5313 100644 (file)
@@ -325,8 +325,8 @@ int main(int argc, char **argv)
        struct ifreq device;
        struct ifreq hwtstamp;
        struct hwtstamp_config hwconfig, hwconfig_requested;
-       struct so_timestamping so_timestamping_get = { 0, -1 };
-       struct so_timestamping so_timestamping = { 0, -1 };
+       struct so_timestamping so_timestamping_get = { 0, 0 };
+       struct so_timestamping so_timestamping = { 0, 0 };
        struct sockaddr_in addr;
        struct ip_mreq imr;
        struct in_addr iaddr;