Browse Source

net: packet: Hook into time based transmission.

For raw layer-2 packets, copy the desired future transmit time from
the CMSG cookie into the skb.

Signed-off-by: Richard Cochran <rcochran@linutronix.de>
Signed-off-by: Jesus Sanchez-Palencia <jesus.sanchez-palencia@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Richard Cochran 7 years ago
parent
commit
3d0ba8c03c
1 changed files with 6 additions and 0 deletions
  1. 6 0
      net/packet/af_packet.c

+ 6 - 0
net/packet/af_packet.c

@@ -1951,6 +1951,7 @@ retry:
 		goto out_unlock;
 		goto out_unlock;
 	}
 	}
 
 
+	sockc.transmit_time = 0;
 	sockc.tsflags = sk->sk_tsflags;
 	sockc.tsflags = sk->sk_tsflags;
 	if (msg->msg_controllen) {
 	if (msg->msg_controllen) {
 		err = sock_cmsg_send(sk, msg, &sockc);
 		err = sock_cmsg_send(sk, msg, &sockc);
@@ -1962,6 +1963,7 @@ retry:
 	skb->dev = dev;
 	skb->dev = dev;
 	skb->priority = sk->sk_priority;
 	skb->priority = sk->sk_priority;
 	skb->mark = sk->sk_mark;
 	skb->mark = sk->sk_mark;
+	skb->tstamp = sockc.transmit_time;
 
 
 	sock_tx_timestamp(sk, sockc.tsflags, &skb_shinfo(skb)->tx_flags);
 	sock_tx_timestamp(sk, sockc.tsflags, &skb_shinfo(skb)->tx_flags);
 
 
@@ -2457,6 +2459,7 @@ static int tpacket_fill_skb(struct packet_sock *po, struct sk_buff *skb,
 	skb->dev = dev;
 	skb->dev = dev;
 	skb->priority = po->sk.sk_priority;
 	skb->priority = po->sk.sk_priority;
 	skb->mark = po->sk.sk_mark;
 	skb->mark = po->sk.sk_mark;
+	skb->tstamp = sockc->transmit_time;
 	sock_tx_timestamp(&po->sk, sockc->tsflags, &skb_shinfo(skb)->tx_flags);
 	sock_tx_timestamp(&po->sk, sockc->tsflags, &skb_shinfo(skb)->tx_flags);
 	skb_shinfo(skb)->destructor_arg = ph.raw;
 	skb_shinfo(skb)->destructor_arg = ph.raw;
 
 
@@ -2633,6 +2636,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg)
 	if (unlikely(!(dev->flags & IFF_UP)))
 	if (unlikely(!(dev->flags & IFF_UP)))
 		goto out_put;
 		goto out_put;
 
 
+	sockc.transmit_time = 0;
 	sockc.tsflags = po->sk.sk_tsflags;
 	sockc.tsflags = po->sk.sk_tsflags;
 	if (msg->msg_controllen) {
 	if (msg->msg_controllen) {
 		err = sock_cmsg_send(&po->sk, msg, &sockc);
 		err = sock_cmsg_send(&po->sk, msg, &sockc);
@@ -2829,6 +2833,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
 	if (unlikely(!(dev->flags & IFF_UP)))
 	if (unlikely(!(dev->flags & IFF_UP)))
 		goto out_unlock;
 		goto out_unlock;
 
 
+	sockc.transmit_time = 0;
 	sockc.tsflags = sk->sk_tsflags;
 	sockc.tsflags = sk->sk_tsflags;
 	sockc.mark = sk->sk_mark;
 	sockc.mark = sk->sk_mark;
 	if (msg->msg_controllen) {
 	if (msg->msg_controllen) {
@@ -2903,6 +2908,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len)
 	skb->dev = dev;
 	skb->dev = dev;
 	skb->priority = sk->sk_priority;
 	skb->priority = sk->sk_priority;
 	skb->mark = sockc.mark;
 	skb->mark = sockc.mark;
+	skb->tstamp = sockc.transmit_time;
 
 
 	if (has_vnet_hdr) {
 	if (has_vnet_hdr) {
 		err = virtio_net_hdr_to_skb(skb, &vnet_hdr, vio_le());
 		err = virtio_net_hdr_to_skb(skb, &vnet_hdr, vio_le());