29 lines
993 B
Diff
29 lines
993 B
Diff
diff --git a/include/net/sock.h b/include/net/sock.h
|
|
index 14d3c07..818a1d1 100644
|
|
--- a/include/net/sock.h
|
|
+++ b/include/net/sock.h
|
|
@@ -2148,8 +2148,8 @@ sock_recv_timestamp(struct msghdr *msg, struct sock *sk, struct sk_buff *skb)
|
|
*/
|
|
if (sock_flag(sk, SOCK_RCVTSTAMP) ||
|
|
(sk->sk_tsflags & SOF_TIMESTAMPING_RX_SOFTWARE) ||
|
|
- (kt.tv64 && sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE) ||
|
|
- (hwtstamps->hwtstamp.tv64 &&
|
|
+ (kt && sk->sk_tsflags & SOF_TIMESTAMPING_SOFTWARE) ||
|
|
+ (hwtstamps->hwtstamp &&
|
|
(sk->sk_tsflags & SOF_TIMESTAMPING_RAW_HARDWARE)))
|
|
__sock_recv_timestamp(msg, sk, skb);
|
|
else
|
|
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
|
|
index b2df375..02c065f 100644
|
|
--- a/net/core/skbuff.c
|
|
+++ b/net/core/skbuff.c
|
|
@@ -4212,7 +4212,7 @@ EXPORT_SYMBOL(skb_try_coalesce);
|
|
*/
|
|
void skb_scrub_packet(struct sk_buff *skb, bool xnet)
|
|
{
|
|
- skb->tstamp.tv64 = 0;
|
|
+ skb->tstamp = 0;
|
|
skb->pkt_type = PACKET_HOST;
|
|
skb->skb_iif = 0;
|
|
skb->ignore_df = 0;
|