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

Commit c47d8c2f authored by Jesus Sanchez-Palencia's avatar Jesus Sanchez-Palencia Committed by David S. Miller
Browse files

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



This is done in preparation for the upcoming time based transmission
patchset. Now that skb->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: default avatarJesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d287c502

net/core/skbuff.c

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