diff options
| author |   Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com> | 2018-07-03 15:42:47 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2018-07-04 22:30:27 +0900 |
| commit | c47d8c2f38f805ba541496ddd7d8c3aee59b49d5 (patch) | |
| tree | 426996e40c6143bb5d66665d5a9b2ca81048e6ac /net/core/skbuff.c | |
| parent | isdn: mark expected switch fall-throughs (diff) | |
| download | linux-dev-c47d8c2f38f805ba541496ddd7d8c3aee59b49d5.tar.xz linux-dev-c47d8c2f38f805ba541496ddd7d8c3aee59b49d5.zip | |
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: Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/skbuff.c')
| -rw-r--r-- | net/core/skbuff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 1357f36c8a5e..c4e24ac27464 100644 --- 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); |