netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] tg3: fix to append hardware time stamping flags
@ 2013-04-30 17:20 Flavio Leitner
  2013-04-30 19:11 ` David Miller
  0 siblings, 1 reply; 5+ messages in thread
From: Flavio Leitner @ 2013-04-30 17:20 UTC (permalink / raw)
  To: netdev
  Cc: Jiri Benc, Nithin Nayak Sujir, Michael Chan, Sergei Shtylyov,
	Flavio Leitner

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>
---
 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH net-next] tg3: fix to append hardware time stamping flags
  2013-04-30 17:20 [PATCH net-next] tg3: fix to append hardware time stamping flags Flavio Leitner
@ 2013-04-30 19:11 ` David Miller
  0 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2013-04-30 19:11 UTC (permalink / raw)
  To: fbl; +Cc: netdev, jbenc, nsujir, mchan, sergei.shtylyov

From: Flavio Leitner <fbl@redhat.com>
Date: Tue, 30 Apr 2013 14:20:34 -0300

> 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>

Applied, thanks.

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH net-next] tg3: fix to append hardware time stamping flags
  2013-04-30 16:58 ` Sergei Shtylyov
@ 2013-04-30 17:16   ` Flavio Leitner
  0 siblings, 0 replies; 5+ messages in thread
From: Flavio Leitner @ 2013-04-30 17:16 UTC (permalink / raw)
  To: Sergei Shtylyov; +Cc: netdev, Jiri Benc, Nithin Nayak Sujir, Michael Chan

On Tue, Apr 30, 2013 at 08:58:51PM +0400, Sergei Shtylyov wrote:
> Hello.
> 
> On 04/30/2013 06:09 PM, Flavio Leitner wrote:
> 
> >The commit f233a976ad15c3b8c54c0157f3c41d23f7514279 fixing the
> 
>    Please also specify that commit's summary in parens.

Ok, please drop this patch. I will send another one.
Thanks,

-- 
fbl

^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH net-next] tg3: fix to append hardware time stamping flags
  2013-04-30 14:09 Flavio Leitner
@ 2013-04-30 16:58 ` Sergei Shtylyov
  2013-04-30 17:16   ` Flavio Leitner
  0 siblings, 1 reply; 5+ messages in thread
From: Sergei Shtylyov @ 2013-04-30 16:58 UTC (permalink / raw)
  To: Flavio Leitner; +Cc: netdev, Jiri Benc, Nithin Nayak Sujir, Michael Chan

Hello.

On 04/30/2013 06:09 PM, Flavio Leitner wrote:

> The commit f233a976ad15c3b8c54c0157f3c41d23f7514279 fixing the

    Please also specify that commit's summary in parens.

> hardware time stamping support didn't append hardware flags.
> This patch fixes it.
>
> Signed-off-by: Flavio Leitner <fbl@redhat.com>

WBR, Sergei

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH net-next] tg3: fix to append hardware time stamping flags
@ 2013-04-30 14:09 Flavio Leitner
  2013-04-30 16:58 ` Sergei Shtylyov
  0 siblings, 1 reply; 5+ messages in thread
From: Flavio Leitner @ 2013-04-30 14:09 UTC (permalink / raw)
  To: netdev; +Cc: Jiri Benc, Nithin Nayak Sujir, Michael Chan, Flavio Leitner

The commit f233a976ad15c3b8c54c0157f3c41d23f7514279 fixing the
hardware time stamping support didn't append hardware flags.
This patch fixes it.

Signed-off-by: Flavio Leitner <fbl@redhat.com>
---
 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

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2013-04-30 19:11 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-04-30 17:20 [PATCH net-next] tg3: fix to append hardware time stamping flags Flavio Leitner
2013-04-30 19:11 ` David Miller
  -- strict thread matches above, loose matches on Subject: below --
2013-04-30 14:09 Flavio Leitner
2013-04-30 16:58 ` Sergei Shtylyov
2013-04-30 17:16   ` Flavio Leitner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).