lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[TCP]: cleanup tcp_parse_options deep indented switch

Browse Source 
Removed case indentation level & combined some nested ifs, mostly
within 80 lines now. This is a leftover from indent patch, it
just had to be done manually to avoid messing it up completely.

Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ilpo Järvinen
2008-01-03 20:36:55 -08:00
committed by David S. Miller
parent dbb1db8b59
commit f038ac8f9b
1 changed files with 70 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
net/ipv4/tcp_input.c
View File

@@ -3294,15 +3294,16 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
if (opsize == TCPOLEN_MSS && th->syn && !estab) { if (opsize == TCPOLEN_MSS && th->syn && !estab) {
u16 in_mss = ntohs(get_unaligned((__be16 *)ptr)); u16 in_mss = ntohs(get_unaligned((__be16 *)ptr));
if (in_mss) { if (in_mss) {
if (opt_rx->user_mss && opt_rx->user_mss < in_mss) if (opt_rx->user_mss &&
opt_rx->user_mss < in_mss)
in_mss = opt_rx->user_mss; in_mss = opt_rx->user_mss;
opt_rx->mss_clamp = in_mss; opt_rx->mss_clamp = in_mss;
} }
} }
break; break;
case TCPOPT_WINDOW: case TCPOPT_WINDOW:
if (opsize==TCPOLEN_WINDOW && th->syn && !estab) if (opsize == TCPOLEN_WINDOW && th->syn &&
if (sysctl_tcp_window_scaling) { !estab && sysctl_tcp_window_scaling) {
__u8 snd_wscale = *(__u8 *)ptr; __u8 snd_wscale = *(__u8 *)ptr;
opt_rx->wscale_ok = 1; opt_rx->wscale_ok = 1;
if (snd_wscale > 14) { if (snd_wscale > 14) {
@@ -3316,22 +3317,20 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
} }
break; break;
case TCPOPT_TIMESTAMP: case TCPOPT_TIMESTAMP:
if (opsize==TCPOLEN_TIMESTAMP) { if ((opsize == TCPOLEN_TIMESTAMP) &&
if ((estab && opt_rx->tstamp_ok) || ((estab && opt_rx->tstamp_ok) ||
(!estab && sysctl_tcp_timestamps)) { (!estab && sysctl_tcp_timestamps))) {
opt_rx->saw_tstamp = 1; opt_rx->saw_tstamp = 1;
opt_rx->rcv_tsval = ntohl(get_unaligned((__be32 *)ptr)); opt_rx->rcv_tsval = ntohl(get_unaligned((__be32 *)ptr));
opt_rx->rcv_tsecr = ntohl(get_unaligned((__be32 *)(ptr+4))); opt_rx->rcv_tsecr = ntohl(get_unaligned((__be32 *)(ptr+4)));
} }
}
break; break;
case TCPOPT_SACK_PERM: case TCPOPT_SACK_PERM:
if (opsize==TCPOLEN_SACK_PERM && th->syn && !estab) { if (opsize == TCPOLEN_SACK_PERM && th->syn &&
if (sysctl_tcp_sack) { !estab && sysctl_tcp_sack) {
opt_rx->sack_ok = 1; opt_rx->sack_ok = 1;
tcp_sack_reset(opt_rx); tcp_sack_reset(opt_rx);
} }
}
break; break;
case TCPOPT_SACK: case TCPOPT_SACK: