diff options
| author | Yangbo Lu <yangbo.lu@nxp.com> | 2016-06-02 17:36:28 +0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-06-03 19:32:23 -0400 |
| commit | 9c8b0778e48e4bbdb77121c6c1b7dd48e5182e67 (patch) | |
| tree | 07af47943c364135e8efe4bbec0a63142a56fe6a /drivers/net/ethernet | |
| parent | 8d5958f424b62060a8696b12c17dad198d5d386f (diff) | |
| download | linux-stable-9c8b0778e48e4bbdb77121c6c1b7dd48e5182e67.tar.gz linux-stable-9c8b0778e48e4bbdb77121c6c1b7dd48e5182e67.tar.bz2 linux-stable-9c8b0778e48e4bbdb77121c6c1b7dd48e5182e67.zip | |
gianfar: fix the last transmit buffer descriptor
When the transmit hardware timestamping is enabled, an additional
TxBD would be added and would be set as the last TxBD with TXBD_LAST
and TXBD_INTERRUPT. However this has been broken by a patch recently.
This made the software couldn't get transmit hardware timestamps and
resulted in call trace. So, this patch is to fix this issue.
Fixes: 48963b4492e9 ("gianfar: Remove redundant ops for do_tstamp
from xmit()")
Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
Reviewed-by: Claudiu Manoil <claudiu.manoil@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c index 7615e0668acb..2e6785b6e8be 100644 --- a/drivers/net/ethernet/freescale/gianfar.c +++ b/drivers/net/ethernet/freescale/gianfar.c @@ -2440,7 +2440,8 @@ static int gfar_start_xmit(struct sk_buff *skb, struct net_device *dev) tx_queue->tx_ring_size); if (likely(!nr_frags)) { - lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT); + if (likely(!do_tstamp)) + lstatus |= BD_LFLAG(TXBD_LAST | TXBD_INTERRUPT); } else { u32 lstatus_start = lstatus; |