Skip to content

Commit

Permalink
r6040: fix race in transmit time stamping.
Browse files Browse the repository at this point in the history
Signed-off-by: Richard Cochran <richard.cochran@omicron.at>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Richard Cochran authored and David S. Miller committed Jun 19, 2011
1 parent d515b45 commit 2aa8f4c
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions drivers/net/r6040.c
Original file line number Diff line number Diff line change
Expand Up @@ -836,6 +836,9 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb,
descptr->buf = cpu_to_le32(pci_map_single(lp->pdev,
skb->data, skb->len, PCI_DMA_TODEVICE));
descptr->status = DSC_OWNER_MAC;

skb_tx_timestamp(skb);

/* Trigger the MAC to check the TX descriptor */
iowrite16(0x01, ioaddr + MTPR);
lp->tx_insert_ptr = descptr->vndescp;
Expand All @@ -846,8 +849,6 @@ static netdev_tx_t r6040_start_xmit(struct sk_buff *skb,

spin_unlock_irqrestore(&lp->lock, flags);

skb_tx_timestamp(skb);

return NETDEV_TX_OK;
}

Expand Down

0 comments on commit 2aa8f4c

Please sign in to comment.