From mboxrd@z Thu Jan 1 00:00:00 1970 From: Flavio Leitner Subject: [PATCH net-next] tg3: fix to append hardware time stamping flags Date: Tue, 30 Apr 2013 14:20:34 -0300 Message-ID: <1367342434-1946-1-git-send-email-fbl@redhat.com> Cc: Jiri Benc , Nithin Nayak Sujir , Michael Chan , Sergei Shtylyov , Flavio Leitner To: netdev Return-path: Received: from mx1.redhat.com ([209.132.183.28]:4399 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932395Ab3D3RUk (ORCPT ); Tue, 30 Apr 2013 13:20:40 -0400 Sender: netdev-owner@vger.kernel.org List-ID: 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 --- drivers/net/ethernet/broadcom/tg3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; } -- 1.8.1.4