diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2007-08-09 08:14:46 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:48:00 -0400 |
commit | e60402d0a909ca2e6e2fbdf9ed004ef0fae36d33 (patch) | |
tree | b40a00b801cf44f81bebd7dadddb19c0086b145c /net/ipv4/tcp_minisocks.c | |
parent | b9c4595bc4947faa236a849324fe3492e388d949 (diff) |
[TCP]: Move sack_ok access to obviously named funcs & cleanup
Previously code had IsReno/IsFack defined as macros that were
local to tcp_input.c though sack_ok field has user elsewhere too
for the same purpose. This changes them to static inlines as
preferred according the current coding style and unifies the
access to sack_ok across multiple files. Magic bitops of sack_ok
for FACK and DSACK are also abstracted to functions with
appropriate names.
Note:
- One sack_ok = 1 remains but that's self explanary, i.e., it
enables sack
- Couple of !IsReno cases are changed to tcp_is_sack
- There were no users for IsDSack => I dropped it
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_minisocks.c')
-rw-r--r-- | net/ipv4/tcp_minisocks.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index fdfe89fe646b..b61b76847ad9 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c | |||
@@ -445,7 +445,7 @@ struct sock *tcp_create_openreq_child(struct sock *sk, struct request_sock *req, | |||
445 | newtp->rx_opt.tstamp_ok = ireq->tstamp_ok; | 445 | newtp->rx_opt.tstamp_ok = ireq->tstamp_ok; |
446 | if ((newtp->rx_opt.sack_ok = ireq->sack_ok) != 0) { | 446 | if ((newtp->rx_opt.sack_ok = ireq->sack_ok) != 0) { |
447 | if (sysctl_tcp_fack) | 447 | if (sysctl_tcp_fack) |
448 | newtp->rx_opt.sack_ok |= 2; | 448 | tcp_enable_fack(newtp); |
449 | } | 449 | } |
450 | newtp->window_clamp = req->window_clamp; | 450 | newtp->window_clamp = req->window_clamp; |
451 | newtp->rcv_ssthresh = req->rcv_wnd; | 451 | newtp->rcv_ssthresh = req->rcv_wnd; |