Commit d649563d authored by Eric Dumazet's avatar Eric Dumazet Committed by Greg Kroah-Hartman

net: restore tx timestamping for accelerated vlans

[ Upstream commit 81bbb3d4 ]

Since commit 9b22ea56
( net: fix packet socket delivery in rx irq handler )

We lost rx timestamping of packets received on accelerated vlans.

Effect is that tcpdump on real dev can show strange timings, since it gets rx timestamps
too late (ie at skb dequeueing time, not at skb queueing time)

14:47:26.986871 IP 192.168.20.110 > 192.168.20.141: icmp 64: echo request seq 1
14:47:26.986786 IP 192.168.20.141 > 192.168.20.110: icmp 64: echo reply seq 1

14:47:27.986888 IP 192.168.20.110 > 192.168.20.141: icmp 64: echo request seq 2
14:47:27.986781 IP 192.168.20.141 > 192.168.20.110: icmp 64: echo reply seq 2

14:47:28.986896 IP 192.168.20.110 > 192.168.20.141: icmp 64: echo request seq 3
14:47:28.986780 IP 192.168.20.141 > 192.168.20.110: icmp 64: echo reply seq 3
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 269beb99
...@@ -2248,6 +2248,9 @@ int netif_receive_skb(struct sk_buff *skb) ...@@ -2248,6 +2248,9 @@ int netif_receive_skb(struct sk_buff *skb)
int ret = NET_RX_DROP; int ret = NET_RX_DROP;
__be16 type; __be16 type;
if (!skb->tstamp.tv64)
net_timestamp(skb);
if (skb->vlan_tci && vlan_hwaccel_do_receive(skb)) if (skb->vlan_tci && vlan_hwaccel_do_receive(skb))
return NET_RX_SUCCESS; return NET_RX_SUCCESS;
...@@ -2255,9 +2258,6 @@ int netif_receive_skb(struct sk_buff *skb) ...@@ -2255,9 +2258,6 @@ int netif_receive_skb(struct sk_buff *skb)
if (netpoll_receive_skb(skb)) if (netpoll_receive_skb(skb))
return NET_RX_DROP; return NET_RX_DROP;
if (!skb->tstamp.tv64)
net_timestamp(skb);
if (!skb->iif) if (!skb->iif)
skb->iif = skb->dev->ifindex; skb->iif = skb->dev->ifindex;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment