svn commit: r280202 - head/sys/netinet

Adrian Chadd adrian at FreeBSD.org
Wed Mar 18 04:40:37 UTC 2015


Author: adrian
Date: Wed Mar 18 04:40:36 2015
New Revision: 280202
URL: https://svnweb.freebsd.org/changeset/base/280202

Log:
  Correctly const-ify things.
  
  Found by: clang 3.6

Modified:
  head/sys/netinet/in_rss.c

Modified: head/sys/netinet/in_rss.c
==============================================================================
--- head/sys/netinet/in_rss.c	Wed Mar 18 02:29:51 2015	(r280201)
+++ head/sys/netinet/in_rss.c	Wed Mar 18 04:40:36 2015	(r280202)
@@ -283,7 +283,7 @@ rss_mbuf_software_hash_v4(const struct m
 			printf("%s: short TCP frame?\n", __func__);
 			return (-1);
 		}
-		th = (struct tcphdr *)((caddr_t)ip + iphlen);
+		th = (const struct tcphdr *)((c_caddr_t)ip + iphlen);
 		return rss_proto_software_hash_v4(ip->ip_src, ip->ip_dst,
 		    th->th_sport,
 		    th->th_dport,
@@ -293,7 +293,7 @@ rss_mbuf_software_hash_v4(const struct m
 	} else if ((rss_gethashconfig() & RSS_HASHTYPE_RSS_UDP_IPV4) &&
 	    (proto == IPPROTO_UDP) &&
 	    (is_frag == 0)) {
-		uh = (struct udphdr *)((caddr_t)ip + iphlen);
+		uh = (const struct udphdr *)((c_caddr_t)ip + iphlen);
 		if (m->m_len < iphlen + sizeof(struct udphdr)) {
 			printf("%s: short UDP frame?\n", __func__);
 			return (-1);


More information about the svn-src-head mailing list