diff options
| author |   Flavio Leitner <fbl@redhat.com> | 2013-04-30 07:20:34 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2013-04-30 15:10:39 -0400 |
| commit | 32e192721a4d28102f8a31638d46dee63ac03bcd (patch) | |
| tree | c5883f2a056247f903456bc1ee757d087e7d5191 /drivers/net/ethernet/broadcom/tg3.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-dev-32e192721a4d28102f8a31638d46dee63ac03bcd.tar.xz linux-dev-32e192721a4d28102f8a31638d46dee63ac03bcd.zip | |
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>
Diffstat (limited to 'drivers/net/ethernet/broadcom/tg3.c')
| -rw-r--r-- | drivers/net/ethernet/broadcom/tg3.c | 2 |
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; } |