svn commit: r287277 - head/sys/netinet

[Adrian Chadd]

Author: adrian
Date: Sat Aug 29 06:58:30 2015
New Revision: 287277
URL: https://svnweb.freebsd.org/changeset/base/287277

Log:
  Rename rss_soft_m2cpuid() ->  rss_soft_m2cpuid_v4() in preparation for
  an IPv6 version to show up.
  
  Submitted by:	Tiwei Bie <btw at mail.ustc.edu.cn>
  Differential Revision:	https://reviews.freebsd.org/D3504

Modified:
  head/sys/netinet/in_rss.c
  head/sys/netinet/in_rss.h
  head/sys/netinet/ip_input.c

Modified: head/sys/netinet/in_rss.c
==============================================================================
--- head/sys/netinet/in_rss.c	Sat Aug 29 06:52:14 2015	(r287276)
+++ head/sys/netinet/in_rss.c	Sat Aug 29 06:58:30 2015	(r287277)
@@ -332,7 +332,7 @@ rss_mbuf_software_hash_v4(const struct m
  * XXX TODO: definitely want statistics here!
  */
 struct mbuf *
-rss_soft_m2cpuid(struct mbuf *m, uintptr_t source, u_int *cpuid)
+rss_soft_m2cpuid_v4(struct mbuf *m, uintptr_t source, u_int *cpuid)
 {
 	uint32_t hash_val, hash_type;
 	int ret;

Modified: head/sys/netinet/in_rss.h
==============================================================================
--- head/sys/netinet/in_rss.h	Sat Aug 29 06:52:14 2015	(r287276)
+++ head/sys/netinet/in_rss.h	Sat Aug 29 06:58:30 2015	(r287277)
@@ -51,7 +51,7 @@ int		rss_proto_software_hash_v4(struct i
 		    struct in_addr dst, u_short src_port, u_short dst_port,
 		    int proto, uint32_t *hashval,
 		    uint32_t *hashtype);
-struct mbuf *	rss_soft_m2cpuid(struct mbuf *m, uintptr_t source,
+struct mbuf *	rss_soft_m2cpuid_v4(struct mbuf *m, uintptr_t source,
 		    u_int *cpuid);
 
 #endif /* !_NETINET_IN_RSS_H_ */

Modified: head/sys/netinet/ip_input.c
==============================================================================
--- head/sys/netinet/ip_input.c	Sat Aug 29 06:52:14 2015	(r287276)
+++ head/sys/netinet/ip_input.c	Sat Aug 29 06:58:30 2015	(r287277)
@@ -140,7 +140,7 @@ static struct netisr_handler ip_nh = {
 	.nh_handler = ip_input,
 	.nh_proto = NETISR_IP,
 #ifdef	RSS
-	.nh_m2cpuid = rss_soft_m2cpuid,
+	.nh_m2cpuid = rss_soft_m2cpuid_v4,
 	.nh_policy = NETISR_POLICY_CPU,
 	.nh_dispatch = NETISR_DISPATCH_HYBRID,
 #else