提交 cabf7f90 编写于 作者: P Paul Thomas 提交者: Greg Kroah-Hartman

net: macb driver, check for SKBTX_HW_TSTAMP

commit a62520473f15750cd1432d36b377a06cd7cff8d2 upstream.

Make sure SKBTX_HW_TSTAMP (i.e. SOF_TIMESTAMPING_TX_HARDWARE) has been
enabled for this skb. It does fix the issue where normal socks that
aren't expecting a timestamp will not wake up on select, but when a
user does want a SOF_TIMESTAMPING_TX_HARDWARE it does work.
Signed-off-by: NPaul Thomas <pthomas8589@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 e8d59efd
...@@ -860,7 +860,9 @@ static void macb_tx_interrupt(struct macb_queue *queue) ...@@ -860,7 +860,9 @@ static void macb_tx_interrupt(struct macb_queue *queue)
/* First, update TX stats if needed */ /* First, update TX stats if needed */
if (skb) { if (skb) {
if (gem_ptp_do_txstamp(queue, skb, desc) == 0) { if (unlikely(skb_shinfo(skb)->tx_flags &
SKBTX_HW_TSTAMP) &&
gem_ptp_do_txstamp(queue, skb, desc) == 0) {
/* skb now belongs to timestamp buffer /* skb now belongs to timestamp buffer
* and will be removed later * and will be removed later
*/ */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册