summaryrefslogtreecommitdiff
path: root/drivers/net/tun.c
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2016-09-20 13:12:59 -0700
committerDmitry Shmidt <dimitrysh@google.com>2016-09-20 13:12:59 -0700
commit321249bb2f9c61fd19adead0de1e058b94108d18 (patch)
tree58beee90c04911c4bcb08da2b2a76fe7c486f485 /drivers/net/tun.c
parenta517d900c6b4996dd6a6ba2f600dabe1c4da717a (diff)
parentb7c491d2c40fde253ec06a63b3f93ea60c0467a9 (diff)
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y-merge
Change-Id: I049d2e9d238a92d56100e8e317be6688497eb501
Diffstat (limited to 'drivers/net/tun.c')
-rw-r--r--drivers/net/tun.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 62f2d80a9fe0..6941f0888b00 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -862,10 +862,7 @@ static netdev_tx_t tun_net_xmit(struct sk_buff *skb, struct net_device *dev)
if (unlikely(skb_orphan_frags(skb, GFP_ATOMIC)))
goto drop;
- if (skb->sk && sk_fullsock(skb->sk)) {
- sock_tx_timestamp(skb->sk, &skb_shinfo(skb)->tx_flags);
- sw_tx_timestamp(skb);
- }
+ skb_tx_timestamp(skb);
/* Orphan the skb - required as we might hang on to it
* for indefinite time.