diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-28 23:06:11 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-28 23:06:11 +0300 |
| commit | 2a9e8438a29c00432ae14eaceb088b965f8ac290 (patch) | |
| tree | 8ac718cd55a6ec72241c647e38856d904797a078 /net/socket.c | |
| parent | ba7863f4d3bfe1698e0a92934cbc9c3021f4448d (diff) | |
| parent | 0a2cf20c3fb62ad4717276b5303bf831f7b29d54 (diff) | |
| download | linux-2a9e8438a29c00432ae14eaceb088b965f8ac290.tar.xz | |
Merge branch 'tcp-redundant-checks'
Soheil Hassas Yeganeh says:
====================
tcp: simplify ack tx timestamps
v2:
- Fully remove SKBTX_ACK_TSTAMP, as suggested by Willem de Bruijn.
This patch series aims at removing redundant checks and fields
for ack timestamps for TCP.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/socket.c')
| -rw-r--r-- | net/socket.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/net/socket.c b/net/socket.c index 5dbb0bbe12a7..7789d79609dd 100644 --- a/net/socket.c +++ b/net/socket.c @@ -600,9 +600,6 @@ void __sock_tx_timestamp(__u16 tsflags, __u8 *tx_flags) if (tsflags & SOF_TIMESTAMPING_TX_SCHED) flags |= SKBTX_SCHED_TSTAMP; - if (tsflags & SOF_TIMESTAMPING_TX_ACK) - flags |= SKBTX_ACK_TSTAMP; - *tx_flags = flags; } EXPORT_SYMBOL(__sock_tx_timestamp); |