diff options
| author | Jens Axboe <axboe@fb.com> | 2016-09-15 08:38:34 -0600 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2016-09-15 08:38:34 -0600 |
| commit | 474b313de79e034e269955de23231da769a521b7 (patch) | |
| tree | 877e3c883aff3edfe4f378c69f7ba738b0d8ef94 /drivers/net/tun.c | |
| parent | 2849450ad39d2e699fda2d5c6f41e05d87fd7004 (diff) | |
| parent | ee8d41e53efe14bfc5ea5866e1178b06d78a7c95 (diff) | |
| download | linux-474b313de79e034e269955de23231da769a521b7.tar.bz2 | |
Merge branch 'irq/for-block' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into for-4.9/msi-irq
Diffstat (limited to 'drivers/net/tun.c')
| -rw-r--r-- | drivers/net/tun.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 9c8b5bc2b9d8..6f9df375c5d4 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -894,11 +894,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->sk->sk_tsflags, - &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. |