]> Pileus Git - ~andy/linux/commitdiff
tg3: fix to append hardware time stamping flags
authorFlavio Leitner <fbl@redhat.com>
Tue, 30 Apr 2013 07:20:34 +0000 (07:20 +0000)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Apr 2013 19:10:39 +0000 (15:10 -0400)
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>
drivers/net/ethernet/broadcom/tg3.c

index ef0b8a6531550eec87c4489668c84014b4d69ebb..728d42ab2a7636e4656a28174ac2b8c9159c60f0 100644 (file)
@@ -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;
        }