svn commit: r280202 - head/sys/netinet

Gleb Smirnoff glebius at FreeBSD.org
Wed Mar 18 04:58:48 UTC 2015


  Adrian,

On Wed, Mar 18, 2015 at 04:40:37AM +0000, Adrian Chadd wrote:
A> Author: adrian
A> Date: Wed Mar 18 04:40:36 2015
A> New Revision: 280202
A> URL: https://svnweb.freebsd.org/changeset/base/280202
A> 
A> Log:
A>   Correctly const-ify things.

Why do you prefer caddr_t over 'char *'?

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

-- 
Totus tuus, Glebius.


More information about the svn-src-head mailing list