net: Clear skb->tstamp only on the forwarding path

Jesus Sanchez-Palencia · davem330 · commit c47d8c2f38f8 · 2018-07-04T22:30:27.000+09:00
This is done in preparation for the upcoming time based transmission
patchset. Now that skb-&gt;tstamp will be used to hold packet's txtime,
we must ensure that it is being cleared when traversing namespaces.
Also, doing that from skb_scrub_packet() before the early return would
break our feature when tunnels are used.

Signed-off-by: Jesus Sanchez-Palencia &lt;jesus.sanchez-palencia@intel.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
@@ -4898,7 +4898,6 @@ EXPORT_SYMBOL(skb_try_coalesce);
  */
 void skb_scrub_packet(struct sk_buff *skb, bool xnet)
 {
-	skb->tstamp = 0;
 	skb->pkt_type = PACKET_HOST;
 	skb->skb_iif = 0;
 	skb->ignore_df = 0;
@@ -4912,6 +4911,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)
 
 	ipvs_reset(skb);
 	skb->mark = 0;
+	skb->tstamp = 0;
 }
 EXPORT_SYMBOL_GPL(skb_scrub_packet);
 

Original file line number	Diff line number	Diff line change
`@@ -4898,7 +4898,6 @@ EXPORT_SYMBOL(skb_try_coalesce);`
`4898`	`4898`	`*/`
`4899`	`4899`	`void skb_scrub_packet(struct sk_buff *skb, bool xnet)`
`4900`	`4900`	`{`
`4901`		`- skb->tstamp = 0;`
`4902`	`4901`	`skb->pkt_type = PACKET_HOST;`
`4903`	`4902`	`skb->skb_iif = 0;`
`4904`	`4903`	`skb->ignore_df = 0;`
`@@ -4912,6 +4911,7 @@ void skb_scrub_packet(struct sk_buff *skb, bool xnet)`
`4912`	`4911`
`4913`	`4912`	`ipvs_reset(skb);`
`4914`	`4913`	`skb->mark = 0;`
	`4914`	`+ skb->tstamp = 0;`
`4915`	`4915`	`}`
`4916`	`4916`	`EXPORT_SYMBOL_GPL(skb_scrub_packet);`
`4917`	`4917`