D60556.1794753035.diff
No OneTemporary
Actions

Authored By

Unknown

Size

1 KB

Referenced Files

None

Subscribers

None

D60556.1794753035.diff
View Options

	diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
	--- a/sys/net/if_gre.c
	+++ b/sys/net/if_gre.c
	@@ -37,7 +37,6 @@
	#include <sys/cdefs.h>
	#include "opt_inet.h"
	#include "opt_inet6.h"
	-#include "opt_rss.h"

	#include <sys/param.h>
	#include <sys/jail.h>
	@@ -73,19 +72,15 @@
	#include <netinet/in_var.h>
	#include <netinet/ip.h>
	#include <netinet/ip_var.h>
	-#ifdef RSS
	#include <netinet/in_rss.h>
	#endif
	-#endif

	#ifdef INET6
	#include <netinet/ip6.h>
	#include <netinet6/in6_var.h>
	#include <netinet6/ip6_var.h>
	-#ifdef RSS
	#include <netinet6/in6_rss.h>
	#endif
	-#endif

	#include <netinet/ip_encap.h>
	#include <netinet/udp.h>
	@@ -894,26 +889,16 @@
	switch (af) {
	#ifdef INET
	case AF_INET:
	-#ifdef RSS
	flowid = rss_hash_ip4_2tuple(mtod(m, struct ip *)->ip_src,
	mtod(m, struct ip *)->ip_dst);
	break;
	-#endif
	- flowid = mtod(m, struct ip *)->ip_src.s_addr ^
	- mtod(m, struct ip *)->ip_dst.s_addr;
	- break;
	#endif
	#ifdef INET6
	case AF_INET6:
	-#ifdef RSS
	flowid = rss_hash_ip6_2tuple(
	&mtod(m, struct ip6_hdr *)->ip6_src,
	&mtod(m, struct ip6_hdr *)->ip6_dst);
	break;
	-#endif
	- flowid = mtod(m, struct ip6_hdr *)->ip6_src.s6_addr32[3] ^
	- mtod(m, struct ip6_hdr *)->ip6_dst.s6_addr32[3];
	- break;
	#endif
	default:
	break;