Skip to content

Commit 07eb61f

Browse files
kmaincentroxanan1996
authored andcommitted
net: phy: micrel: fix ts_info value in case of no phc
BugLink: https://bugs.launchpad.net/bugs/2059284 [ Upstream commit 915d25a ] In case of no phc we should not return SOFTWARE TIMESTAMPING flags as we do not know whether the netdev supports of timestamping. Remove it from the lan8841_ts_info and simply return 0. Signed-off-by: Kory Maincent <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Sasha Levin <[email protected]> Signed-off-by: Manuel Diewald <[email protected]> Signed-off-by: Stefan Bader <[email protected]>
1 parent 706a9ad commit 07eb61f

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

drivers/net/phy/micrel.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3628,12 +3628,8 @@ static int lan8841_ts_info(struct mii_timestamper *mii_ts,
36283628

36293629
info->phc_index = ptp_priv->ptp_clock ?
36303630
ptp_clock_index(ptp_priv->ptp_clock) : -1;
3631-
if (info->phc_index == -1) {
3632-
info->so_timestamping |= SOF_TIMESTAMPING_TX_SOFTWARE |
3633-
SOF_TIMESTAMPING_RX_SOFTWARE |
3634-
SOF_TIMESTAMPING_SOFTWARE;
3631+
if (info->phc_index == -1)
36353632
return 0;
3636-
}
36373633

36383634
info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
36393635
SOF_TIMESTAMPING_RX_HARDWARE |

0 commit comments

Comments
 (0)