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

Commit 1aba721e authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by David S. Miller
Browse files

Add the no SACK route option feature 



Implement querying and acting upon the no sack bit in the features
field.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@codefidence.com>
Sigend-off-by: default avatarOri Finkelman <ori@comsleep.com>
Sigend-off-by: default avatarYony Amit <yony@comsleep.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0c3adfb8

include/linux/rtnetlink.h

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ enum 
#define RTAX_MAX (__RTAX_MAX - 1)



#define RTAX_FEATURE_ECN	0x00000001

#define RTAX_FEATURE_SACK	0x00000002

#define RTAX_FEATURE_NO_SACK	0x00000002

#define RTAX_FEATURE_TIMESTAMP	0x00000004

#define RTAX_FEATURE_ALLFRAG	0x00000008

net/ipv4/tcp_input.c

+2 −1
Original line number Diff line number Diff line
@@ -3763,7 +3763,8 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx, 
				break;

			case TCPOPT_SACK_PERM:

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

				    !estab && sysctl_tcp_sack) {

				    !estab && sysctl_tcp_sack &&

				    !dst_feature(dst, RTAX_FEATURE_NO_SACK)) {

					opt_rx->sack_ok = 1;

					tcp_sack_reset(opt_rx);

				}

net/ipv4/tcp_output.c

+3 −1
Original line number Diff line number Diff line
@@ -464,6 +464,7 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb, 
				struct tcp_md5sig_key **md5) {

	struct tcp_sock *tp = tcp_sk(sk);

	unsigned size = 0;

	struct dst_entry *dst = __sk_dst_get(sk);



#ifdef CONFIG_TCP_MD5SIG

	*md5 = tp->af_specific->md5_lookup(sk, sk);
@@ -498,7 +499,8 @@ static unsigned tcp_syn_options(struct sock *sk, struct sk_buff *skb, 
		opts->options |= OPTION_WSCALE;

		size += TCPOLEN_WSCALE_ALIGNED;

	}

	if (likely(sysctl_tcp_sack)) {

	if (likely(sysctl_tcp_sack &&

		   !dst_feature(dst, RTAX_FEATURE_NO_SACK))) {

		opts->options |= OPTION_SACK_ADVERTISE;

		if (unlikely(!(OPTION_TS & opts->options)))

			size += TCPOLEN_SACKPERM_ALIGNED;