diff options
| author | David S. Miller <davem@davemloft.net> | 2016-04-28 22:06:11 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-04-28 22:06:11 +0200 |
| commit | 2a9e8438a29c00432ae14eaceb088b965f8ac290 (patch) | |
| tree | 8ac718cd55a6ec72241c647e38856d904797a078 /include | |
| parent | net: snmp: fix 64bit stats on 32bit arches (diff) | |
| parent | tcp: remove SKBTX_ACK_TSTAMP since it is redundant (diff) | |
| download | linux-2a9e8438a29c00432ae14eaceb088b965f8ac290.tar.xz linux-2a9e8438a29c00432ae14eaceb088b965f8ac290.zip | |
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 'include')
| -rw-r--r-- | include/linux/skbuff.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index a1ce63979ad8..c84a5a1078c5 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -382,14 +382,10 @@ enum { /* generate software time stamp when entering packet scheduling */ SKBTX_SCHED_TSTAMP = 1 << 6, - - /* generate software timestamp on peer data acknowledgment */ - SKBTX_ACK_TSTAMP = 1 << 7, }; #define SKBTX_ANY_SW_TSTAMP (SKBTX_SW_TSTAMP | \ - SKBTX_SCHED_TSTAMP | \ - SKBTX_ACK_TSTAMP) + SKBTX_SCHED_TSTAMP) #define SKBTX_ANY_TSTAMP (SKBTX_HW_TSTAMP | SKBTX_ANY_SW_TSTAMP) /* |