diff mbox

[net-next] tg3: fix to append hardware time stamping flags

Message ID 1367330977-6470-1-git-send-email-fbl@redhat.com
State Superseded, archived
Delegated to: David Miller
Headers show

Commit Message

Flavio Leitner April 30, 2013, 2:09 p.m. UTC
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(-)

Comments

Sergei Shtylyov April 30, 2013, 4:58 p.m. UTC | #1
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

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Flavio Leitner April 30, 2013, 5:16 p.m. UTC | #2
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,
diff mbox

Patch

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