Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2aa8f4c9 authored by Richard Cochran's avatar Richard Cochran Committed by David S. Miller
Browse files

r6040: fix race in transmit time stamping. 



Signed-off-by: default avatarRichard Cochran <richard.cochran@omicron.at>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d515b450

drivers/net/r6040.c

+3 −2
Original line number Diff line number Diff line
@@ -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;
@@ -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;

}