From b01bdfed1bb1c030b1f7478ae1ba554c0fd08f16 Mon Sep 17 00:00:00 2001 From: Flavio Leitner Date: Mon, 29 Apr 2013 07:08:07 +0000 Subject: [PATCH] --- yaml --- r: 369827 b: refs/heads/master c: f233a976ad15c3b8c54c0157f3c41d23f7514279 h: refs/heads/master i: 369825: c8d71df926afa05d376490d7113fbc386b9e97c2 369823: a4cc079b669f1e1fdcc021e2c2546f3773dcccc5 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/broadcom/tg3.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0a8714b82ad6..17245f26304a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aebda156a570782a86fc4426842152237a19427d +refs/heads/master: f233a976ad15c3b8c54c0157f3c41d23f7514279 diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c index ac83c87e0b1b..ef0b8a653155 100644 --- a/trunk/drivers/net/ethernet/broadcom/tg3.c +++ b/trunk/drivers/net/ethernet/broadcom/tg3.c @@ -5992,10 +5992,13 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE | SOF_TIMESTAMPING_RX_SOFTWARE | - SOF_TIMESTAMPING_SOFTWARE | - SOF_TIMESTAMPING_TX_HARDWARE | - SOF_TIMESTAMPING_RX_HARDWARE | - SOF_TIMESTAMPING_RAW_HARDWARE; + SOF_TIMESTAMPING_SOFTWARE; + + if (tg3_flag(tp, PTP_CAPABLE)) { + info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE | + SOF_TIMESTAMPING_RX_HARDWARE | + SOF_TIMESTAMPING_RAW_HARDWARE; + } if (tp->ptp_clock) info->phc_index = ptp_clock_index(tp->ptp_clock);