diff mbox

[net-next] tg3: fix to append hardware time stamping flags

Message ID 1367342434-1946-1-git-send-email-fbl@redhat.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Flavio Leitner April 30, 2013, 5:20 p.m. UTC
The commit f233a976ad15c3b8c54c0157f3c41d23f7514279 (tg3: shows
HW time stamping support only if ptp_capable is present) didn't
append hardware flags correctly. This patch fixes it.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
---
 drivers/net/ethernet/broadcom/tg3.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

David Miller April 30, 2013, 7:11 p.m. UTC | #1
From: Flavio Leitner <fbl@redhat.com>
Date: Tue, 30 Apr 2013 14:20:34 -0300

> The commit f233a976ad15c3b8c54c0157f3c41d23f7514279 (tg3: shows
> HW time stamping support only if ptp_capable is present) didn't
> append hardware flags correctly. This patch fixes it.
> 
> Signed-off-by: Flavio Leitner <fbl@redhat.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index ef0b8a6..728d42a 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -5995,7 +5995,7 @@  static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info)
 				SOF_TIMESTAMPING_SOFTWARE;
 
 	if (tg3_flag(tp, PTP_CAPABLE)) {
-		info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE |
+		info->so_timestamping |= SOF_TIMESTAMPING_TX_HARDWARE |
 					SOF_TIMESTAMPING_RX_HARDWARE |
 					SOF_TIMESTAMPING_RAW_HARDWARE;
 	}