Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 059e2392 authored by Sergey Organov's avatar Sergey Organov Committed by Greg Kroah-Hartman
Browse files

net: dp83640: fix SIOCSHWTSTAMP to update the struct with actual configuration 



[ Upstream commit 473309fb8372365ad211f425bca760af800e10a7 ]

From Documentation/networking/timestamping.txt:

  A driver which supports hardware time stamping shall update the
  struct with the actual, possibly more permissive configuration.

Do update the struct passed when we upscale the requested time
stamping mode.

Fixes: cb646e2b ("ptp: Added a clock driver for the National Semiconductor PHYTER.")
Signed-off-by: default avatarSergey Organov <sorganov@gmail.com>
Acked-by: default avatarRichard Cochran <richardcochran@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 041aff4a

drivers/net/phy/dp83640.c

+4 −0
Original line number Diff line number Diff line
@@ -1337,6 +1337,7 @@ static int dp83640_hwtstamp(struct phy_device *phydev, struct ifreq *ifr) 
		dp83640->hwts_rx_en = 1;

		dp83640->layer = PTP_CLASS_L4;

		dp83640->version = PTP_CLASS_V1;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V1_L4_EVENT;

		break;

	case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_L4_SYNC:
@@ -1344,6 +1345,7 @@ static int dp83640_hwtstamp(struct phy_device *phydev, struct ifreq *ifr) 
		dp83640->hwts_rx_en = 1;

		dp83640->layer = PTP_CLASS_L4;

		dp83640->version = PTP_CLASS_V2;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_L4_EVENT;

		break;

	case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_L2_SYNC:
@@ -1351,6 +1353,7 @@ static int dp83640_hwtstamp(struct phy_device *phydev, struct ifreq *ifr) 
		dp83640->hwts_rx_en = 1;

		dp83640->layer = PTP_CLASS_L2;

		dp83640->version = PTP_CLASS_V2;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_L2_EVENT;

		break;

	case HWTSTAMP_FILTER_PTP_V2_EVENT:

	case HWTSTAMP_FILTER_PTP_V2_SYNC:
@@ -1358,6 +1361,7 @@ static int dp83640_hwtstamp(struct phy_device *phydev, struct ifreq *ifr) 
		dp83640->hwts_rx_en = 1;

		dp83640->layer = PTP_CLASS_L4 | PTP_CLASS_L2;

		dp83640->version = PTP_CLASS_V2;

		cfg.rx_filter = HWTSTAMP_FILTER_PTP_V2_EVENT;

		break;

	default:

		return -ERANGE;