aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlavio Leitner <fbl@redhat.com>2013-04-30 07:20:34 +0000
committerDavid S. Miller <davem@davemloft.net>2013-04-30 15:10:39 -0400
commit32e192721a4d28102f8a31638d46dee63ac03bcd (patch)
treec5883f2a056247f903456bc1ee757d087e7d5191
parent58717686cf7c7f5a70b3a8907ade8a3ce74306b1 (diff)
downloadlinux-linaro-stable-32e192721a4d28102f8a31638d46dee63ac03bcd.tar.gz
tg3: fix to append hardware time stamping flags
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> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/tg3.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index ef0b8a653155..728d42ab2a76 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;
}