Skip to content

Commit dff1218

Browse files
committed
Merge: bonding: fix incorrect software timestamping report
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4638 JIRA: https://issues.redhat.com/browse/RHEL-42409 Signed-off-by: Hangbin Liu <haliu@redhat.com> Approved-by: Jarod Wilson <jarod@redhat.com> Approved-by: José Ignacio Tornos Martínez <jtornosm@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 8cc9719 + d753381 commit dff1218

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

drivers/net/bonding/bond_main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5778,6 +5778,9 @@ static int bond_ethtool_get_ts_info(struct net_device *bond_dev,
57785778
if (real_dev) {
57795779
ret = ethtool_get_ts_info_by_layer(real_dev, info);
57805780
} else {
5781+
info->phc_index = -1;
5782+
info->so_timestamping = SOF_TIMESTAMPING_RX_SOFTWARE |
5783+
SOF_TIMESTAMPING_SOFTWARE;
57815784
/* Check if all slaves support software tx timestamping */
57825785
rcu_read_lock();
57835786
bond_for_each_slave_rcu(bond, slave, iter) {

0 commit comments

Comments
 (0)