D55186.diff
No OneTemporary
Actions

Size

962 B

Referenced Files

None

Subscribers

None

D55186.diff
View Options

	diff --git a/sys/net/if_geneve.c b/sys/net/if_geneve.c
	--- a/sys/net/if_geneve.c
	+++ b/sys/net/if_geneve.c
	@@ -3733,11 +3733,7 @@
	}
	iphdr = mtodo(m, offset - sizeof(struct ip));

	- /*
	- * XXX: RFC 6040 MUST be followed for IP packets encapsulated in geneve
	- * therefore should be ECN_COMPLETE of D53516
	- */
	- if (ip_ecn_egress(ECN_ALLOWED, &info->ecn, &iphdr->ip_tos) == 0) {
	+ if (ip_ecn_egress(ECN_COMPLETE, &info->ecn, &iphdr->ip_tos) == 0) {
	*m0 = NULL;
	return (ENOBUFS);
	}
	@@ -3761,12 +3757,8 @@
	}
	ip6hdr = mtodo(m, offset - sizeof(struct ip6_hdr));

	- /*
	- * XXX: RFC 6040 MUST be followed for IP packets encapsulated in geneve
	- * therefore should be ECN_COMPLETE of D53516
	- */
	itos = (ntohl(ip6hdr->ip6_flow) >> IPV6_FLOWLABEL_LEN) & 0xff;
	- if (ip_ecn_egress(ECN_ALLOWED, &info->ecn, &itos) == 0) {
	+ if (ip_ecn_egress(ECN_COMPLETE, &info->ecn, &itos) == 0) {
	*m0 = NULL;
	return (ENOBUFS);
	}