diff options
Diffstat (limited to 'net/packet/af_packet.c')
-rw-r--r-- | net/packet/af_packet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index a74650e98f42..6655793765b2 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -1965,7 +1965,7 @@ retry: | |||
1965 | skb->mark = sk->sk_mark; | 1965 | skb->mark = sk->sk_mark; |
1966 | skb->tstamp = sockc.transmit_time; | 1966 | skb->tstamp = sockc.transmit_time; |
1967 | 1967 | ||
1968 | sock_tx_timestamp(sk, sockc.tsflags, &skb_shinfo(skb)->tx_flags); | 1968 | skb_setup_tx_timestamp(skb, sockc.tsflags); |
1969 | 1969 | ||
1970 | if (unlikely(extra_len == 4)) | 1970 | if (unlikely(extra_len == 4)) |
1971 | skb->no_fcs = 1; | 1971 | skb->no_fcs = 1; |
@@ -2460,7 +2460,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb, | |||
2460 | skb->priority = po->sk.sk_priority; | 2460 | skb->priority = po->sk.sk_priority; |
2461 | skb->mark = po->sk.sk_mark; | 2461 | skb->mark = po->sk.sk_mark; |
2462 | skb->tstamp = sockc->transmit_time; | 2462 | skb->tstamp = sockc->transmit_time; |
2463 | sock_tx_timestamp(&po->sk, sockc->tsflags, &skb_shinfo(skb)->tx_flags); | 2463 | skb_setup_tx_timestamp(skb, sockc->tsflags); |
2464 | skb_zcopy_set_nouarg(skb, ph.raw); | 2464 | skb_zcopy_set_nouarg(skb, ph.raw); |
2465 | 2465 | ||
2466 | skb_reserve(skb, hlen); | 2466 | skb_reserve(skb, hlen); |
@@ -2898,7 +2898,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) | |||
2898 | goto out_free; | 2898 | goto out_free; |
2899 | } | 2899 | } |
2900 | 2900 | ||
2901 | sock_tx_timestamp(sk, sockc.tsflags, &skb_shinfo(skb)->tx_flags); | 2901 | skb_setup_tx_timestamp(skb, sockc.tsflags); |
2902 | 2902 | ||
2903 | if (!vnet_hdr.gso_type && (len > dev->mtu + reserve + extra_len) && | 2903 | if (!vnet_hdr.gso_type && (len > dev->mtu + reserve + extra_len) && |
2904 | !packet_extra_vlan_len_allowed(dev, skb)) { | 2904 | !packet_extra_vlan_len_allowed(dev, skb)) { |