aboutsummaryrefslogtreecommitdiffstats
path: root/net/socket.c
diff options
context:
space:
mode:
authorWillem de Bruijn <willemb@google.com>2014-09-08 19:58:58 -0400
committerDavid S. Miller <davem@davemloft.net>2014-09-09 20:34:41 -0400
commit67cc0d4077951295f42bed63805e91b46c24477b (patch)
tree7a0170e8cd1d6bbef0e09869c5a7eda347d92424 /net/socket.c
parent17448e5f63c8f36d00532327ae65e253d1395b08 (diff)
net-timestamp: optimize sock_tx_timestamp default path
Few packets have timestamping enabled. Exit sock_tx_timestamp quickly in this common case. Signed-off-by: Willem de Bruijn <willemb@google.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
-rw-r--r--net/socket.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/net/socket.c b/net/socket.c
index 2e2586e2dee1..d40f522541aa 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -610,7 +610,7 @@ void sock_release(struct socket *sock)
610} 610}
611EXPORT_SYMBOL(sock_release); 611EXPORT_SYMBOL(sock_release);
612 612
613void sock_tx_timestamp(const struct sock *sk, __u8 *tx_flags) 613void __sock_tx_timestamp(const struct sock *sk, __u8 *tx_flags)
614{ 614{
615 u8 flags = *tx_flags; 615 u8 flags = *tx_flags;
616 616
@@ -626,12 +626,9 @@ void sock_tx_timestamp(const struct sock *sk, __u8 *tx_flags)
626 if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK) 626 if (sk->sk_tsflags & SOF_TIMESTAMPING_TX_ACK)
627 flags |= SKBTX_ACK_TSTAMP; 627 flags |= SKBTX_ACK_TSTAMP;
628 628
629 if (sock_flag(sk, SOCK_WIFI_STATUS))
630 flags |= SKBTX_WIFI_STATUS;
631
632 *tx_flags = flags; 629 *tx_flags = flags;
633} 630}
634EXPORT_SYMBOL(sock_tx_timestamp); 631EXPORT_SYMBOL(__sock_tx_timestamp);
635 632
636static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock, 633static inline int __sock_sendmsg_nosec(struct kiocb *iocb, struct socket *sock,
637 struct msghdr *msg, size_t size) 634 struct msghdr *msg, size_t size)