Index: sys/netinet/ip_input.c
===================================================================
--- sys/netinet/ip_input.c
+++ sys/netinet/ip_input.c
@@ -149,13 +149,6 @@
 };
 
 #ifdef	RSS
-/*
- * Directly dispatched frames are currently assumed
- * to have a flowid already calculated.
- *
- * It should likely have something that assert it
- * actually has valid flow details.
- */
 static struct netisr_handler ip_direct_nh = {
 	.nh_name = "ip_direct",
 	.nh_handler = ip_direct_input,
Index: sys/netinet/ip_reass.c
===================================================================
--- sys/netinet/ip_reass.c
+++ sys/netinet/ip_reass.c
@@ -46,14 +46,12 @@
 #include <sys/mutex.h>
 #include <sys/sysctl.h>
 
-#include <net/rss_config.h>
 #include <net/netisr.h>
 #include <net/vnet.h>
 
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
-#include <netinet/in_rss.h>
 #ifdef MAC
 #include <security/mac/mac_framework.h>
 #endif
@@ -149,9 +147,6 @@
 	int i, hlen, next;
 	u_int8_t ecn, ecn0;
 	uint32_t hash;
-#ifdef	RSS
-	uint32_t rss_hash, rss_type;
-#endif
 
 	/*
 	 * If no reassembling or maxfragsperpacket are 0,
@@ -412,25 +407,6 @@
 
 #ifdef	RSS
 	/*
-	 * Query the RSS layer for the flowid / flowtype for the
-	 * mbuf payload.
-	 *
-	 * For now, just assume we have to calculate a new one.
-	 * Later on we should check to see if the assigned flowid matches
-	 * what RSS wants for the given IP protocol and if so, just keep it.
-	 *
-	 * We then queue into the relevant netisr so it can be dispatched
-	 * to the correct CPU.
-	 *
-	 * Note - this may return 1, which means the flowid in the mbuf
-	 * is correct for the configured RSS hash types and can be used.
-	 */
-	if (rss_mbuf_software_hash_v4(m, 0, &rss_hash, &rss_type) == 0) {
-		m->m_pkthdr.flowid = rss_hash;
-		M_HASHTYPE_SET(m, rss_type);
-	}
-
-	/*
 	 * Queue/dispatch for reprocessing.
 	 *
 	 * Note: this is much slower than just handling the frame in the