From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jiri Benc Subject: Re: [PATCH net-next] tg3: shows HW time stamping support only if ptp_capable is present Date: Tue, 30 Apr 2013 10:50:15 +0200 Message-ID: <20130430105015.097b4b59@griffin> References: <1367255287-2664-1-git-send-email-fbl@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: netdev , Nithin Nayak Sujir , Michael Chan To: Flavio Leitner Return-path: Received: from mx1.redhat.com ([209.132.183.28]:8606 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759617Ab3D3IuT (ORCPT ); Tue, 30 Apr 2013 04:50:19 -0400 In-Reply-To: <1367255287-2664-1-git-send-email-fbl@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: On Mon, 29 Apr 2013 14:08:07 -0300, Flavio Leitner wrote: > Current tg3 shows hardware timestamping support for all devices > when that is true only for the hardware with PTP_CAPABLE flag > present. > > Signed-off-by: Flavio Leitner > --- > drivers/net/ethernet/broadcom/tg3.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c > index ac83c87..ef0b8a6 100644 > --- a/drivers/net/ethernet/broadcom/tg3.c > +++ b/drivers/net/ethernet/broadcom/tg3.c > @@ -5992,10 +5992,13 @@ static int tg3_get_ts_info(struct net_device *dev, struct ethtool_ts_info *info) > > info->so_timestamping = SOF_TIMESTAMPING_TX_SOFTWARE | > SOF_TIMESTAMPING_RX_SOFTWARE | > - SOF_TIMESTAMPING_SOFTWARE | > - SOF_TIMESTAMPING_TX_HARDWARE | > - SOF_TIMESTAMPING_RX_HARDWARE | > - SOF_TIMESTAMPING_RAW_HARDWARE; > + SOF_TIMESTAMPING_SOFTWARE; > + > + if (tg3_flag(tp, PTP_CAPABLE)) { > + info->so_timestamping = SOF_TIMESTAMPING_TX_HARDWARE | ^^^^ You need |= here. > + SOF_TIMESTAMPING_RX_HARDWARE | > + SOF_TIMESTAMPING_RAW_HARDWARE; > + } > > if (tp->ptp_clock) > info->phc_index = ptp_clock_index(tp->ptp_clock); Jiri -- Jiri Benc