diff options
Diffstat (limited to 'net/packet/af_packet.c')
-rw-r--r-- | net/packet/af_packet.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index 3428f7739ae9..47931ebfaef3 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c | |||
@@ -1951,8 +1951,7 @@ retry: | |||
1951 | goto out_unlock; | 1951 | goto out_unlock; |
1952 | } | 1952 | } |
1953 | 1953 | ||
1954 | sockc.transmit_time = 0; | 1954 | sockcm_init(&sockc, sk); |
1955 | sockc.tsflags = sk->sk_tsflags; | ||
1956 | if (msg->msg_controllen) { | 1955 | if (msg->msg_controllen) { |
1957 | err = sock_cmsg_send(sk, msg, &sockc); | 1956 | err = sock_cmsg_send(sk, msg, &sockc); |
1958 | if (unlikely(err)) | 1957 | if (unlikely(err)) |
@@ -2636,8 +2635,7 @@ static int tpacket_snd(struct packet_sock *po, struct msghdr *msg) | |||
2636 | if (unlikely(!(dev->flags & IFF_UP))) | 2635 | if (unlikely(!(dev->flags & IFF_UP))) |
2637 | goto out_put; | 2636 | goto out_put; |
2638 | 2637 | ||
2639 | sockc.transmit_time = 0; | 2638 | sockcm_init(&sockc, &po->sk); |
2640 | sockc.tsflags = po->sk.sk_tsflags; | ||
2641 | if (msg->msg_controllen) { | 2639 | if (msg->msg_controllen) { |
2642 | err = sock_cmsg_send(&po->sk, msg, &sockc); | 2640 | err = sock_cmsg_send(&po->sk, msg, &sockc); |
2643 | if (unlikely(err)) | 2641 | if (unlikely(err)) |
@@ -2833,8 +2831,7 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) | |||
2833 | if (unlikely(!(dev->flags & IFF_UP))) | 2831 | if (unlikely(!(dev->flags & IFF_UP))) |
2834 | goto out_unlock; | 2832 | goto out_unlock; |
2835 | 2833 | ||
2836 | sockc.transmit_time = 0; | 2834 | sockcm_init(&sockc, sk); |
2837 | sockc.tsflags = sk->sk_tsflags; | ||
2838 | sockc.mark = sk->sk_mark; | 2835 | sockc.mark = sk->sk_mark; |
2839 | if (msg->msg_controllen) { | 2836 | if (msg->msg_controllen) { |
2840 | err = sock_cmsg_send(sk, msg, &sockc); | 2837 | err = sock_cmsg_send(sk, msg, &sockc); |