svn commit: r313529 - head/sys/netinet

[O. Hartmann]

On Fri, 10 Feb 2017 06:01:47 +0000 (UTC)
Ermal Luçi <eri at FreeBSD.org> wrote:

> Author: eri
> Date: Fri Feb 10 06:01:47 2017
> New Revision: 313529
> URL: https://svnweb.freebsd.org/changeset/base/313529
> 
> Log:
>   Fix build after r313524
>   
>   Reported-by: ohartmann at walstatt.org
> 
> Modified:
>   head/sys/netinet/udp_usrreq.c
> 
> Modified: head/sys/netinet/udp_usrreq.c
> ==============================================================================
> --- head/sys/netinet/udp_usrreq.c	Fri Feb 10 05:58:16 2017
> (r313528) +++ head/sys/netinet/udp_usrreq.c	Fri Feb 10 06:01:47
> 2017	(r313529) @@ -636,7 +636,7 @@ udp_input(struct mbuf **mp, int
> *offp, i goto badunlocked;
>  		}
>  		UDP_PROBE(receive, NULL, last, ip, last, uh);
> -		if (udp_append(last, ip, m, iphlen, udp_in) == 0) 
> +		if (udp_append(last, ip, m, iphlen, udpin) == 0) 
>  			INP_RUNLOCK(last);
>  	inp_lost:
>  		INP_INFO_RUNLOCK(pcbinfo);
> @@ -726,7 +726,7 @@ udp_input(struct mbuf **mp, int *offp, i
>  	}
>  
>  	UDP_PROBE(receive, NULL, inp, ip, inp, uh);
> -	if (udp_append(inp, ip, m, iphlen, udp_in) == 0) 
> +	if (udp_append(inp, ip, m, iphlen, udpin) == 0) 
>  		INP_RUNLOCK(inp);
>  	return (IPPROTO_DONE);
>  
> _______________________________________________
> svn-src-head at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-head
> To unsubscribe, send any mail to "svn-src-head-unsubscribe at freebsd.org"

Still (r313529) buildkernel breakage:

[...]
/usr/src/sys/netinet6/ip6_output.c:1741:10: error: duplicate case value '65'
                                case IPV6_BINDMULTI:
                                     ^
/usr/src/sys/netinet6/in6.h:492:25: note: expanded from macro 'IPV6_BINDMULTI'
#define IPV6_BINDMULTI          65 /* bool; allow multibind to same addr/port */