summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp_output.c
diff options
context:
space:
mode:
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>2009-03-14 14:23:01 +0000
committerDavid S. Miller <davem@davemloft.net>2009-03-15 20:09:51 -0700
commit5861f8e58dd84fc34b691c2e8d4824dea68c360e (patch)
tree5c202f6866cca91ded45213cbb1a3d7f75fc6749 /net/ipv4/tcp_output.c
parent7cd0a63872ac6ef97265f07adc367ca4f984468e (diff)
downloadlinux-3.10-5861f8e58dd84fc34b691c2e8d4824dea68c360e.tar.gz
linux-3.10-5861f8e58dd84fc34b691c2e8d4824dea68c360e.tar.bz2
linux-3.10-5861f8e58dd84fc34b691c2e8d4824dea68c360e.zip
tcp: remove pointless .dsack/.num_sacks code
In the pure assignment case, the earlier zeroing is still in effect. David S. Miller raised concerns if the ifs are there to avoid dirtying cachelines. I came to these conclusions: > We'll be dirty it anyway (now that I check), the first "real" statement > in tcp_rcv_established is: > > tp->rx_opt.saw_tstamp = 0; > > ...that'll land on the same dword. :-/ > > I suppose the blocks are there just because they had more complexity > inside when they had to calculate the eff_sacks too (maybe it would > have been better to just remove them in that drop-patch so you would > have had less head-ache :-)). Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_output.c')
-rw-r--r--net/ipv4/tcp_output.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c
index eb285befdf3..32565803913 100644
--- a/net/ipv4/tcp_output.c
+++ b/net/ipv4/tcp_output.c
@@ -441,8 +441,7 @@ static void tcp_options_write(__be32 *ptr, struct tcp_sock *tp,
*ptr++ = htonl(sp[this_sack].end_seq);
}
- if (tp->rx_opt.dsack)
- tp->rx_opt.dsack = 0;
+ tp->rx_opt.dsack = 0;
}
}