Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f038ac8f authored by Ilpo Järvinen's avatar Ilpo Järvinen Committed by David S. Miller
Browse files

[TCP]: cleanup tcp_parse_options deep indented switch 



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: default avatarIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dbb1db8b

net/ipv4/tcp_input.c

+67 −68
Original line number Diff line number Diff line
@@ -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) {

					u16 in_mss = ntohs(get_unaligned((__be16 *)ptr));

					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;

						opt_rx->mss_clamp = in_mss;

					}

				}

				break;

			case TCPOPT_WINDOW:

					if (opsize==TCPOLEN_WINDOW && th->syn && !estab)

						if (sysctl_tcp_window_scaling) {

				if (opsize == TCPOLEN_WINDOW && th->syn &&

				    !estab && sysctl_tcp_window_scaling) {

					__u8 snd_wscale = *(__u8 *)ptr;

					opt_rx->wscale_ok = 1;

					if (snd_wscale > 14) {
@@ -3316,22 +3317,20 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx, 
				}

				break;

			case TCPOPT_TIMESTAMP:

					if (opsize==TCPOLEN_TIMESTAMP) {

						if ((estab && opt_rx->tstamp_ok) ||

						    (!estab && sysctl_tcp_timestamps)) {

				if ((opsize == TCPOLEN_TIMESTAMP) &&

				    ((estab && opt_rx->tstamp_ok) ||

				     (!estab && sysctl_tcp_timestamps))) {

					opt_rx->saw_tstamp = 1;

					opt_rx->rcv_tsval = ntohl(get_unaligned((__be32 *)ptr));

					opt_rx->rcv_tsecr = ntohl(get_unaligned((__be32 *)(ptr+4)));

				}

					}

				break;

			case TCPOPT_SACK_PERM:

					if (opsize==TCPOLEN_SACK_PERM && th->syn && !estab) {

						if (sysctl_tcp_sack) {

				if (opsize == TCPOLEN_SACK_PERM && th->syn &&

				    !estab && sysctl_tcp_sack) {

					opt_rx->sack_ok = 1;

					tcp_sack_reset(opt_rx);

				}

					}

				break;



			case TCPOPT_SACK: