[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <1482335994.24490.13@smtp.office365.com>
Date: Wed, 21 Dec 2016 10:59:54 -0500
From: Josef Bacik <jbacik@...com>
To: Hannes Frederic Sowa <hannes@...essinduktion.org>
CC: <davem@...emloft.net>, <kraigatgoog@...il.com>,
<eric.dumazet@...il.com>, <tom@...bertland.com>,
<netdev@...r.kernel.org>, <kernel-team@...com>
Subject: Re: [PATCH 1/5 net-next] inet: replace ->bind_conflict with
->rcv_saddr_equal
On Wed, Dec 21, 2016 at 10:23 AM, Hannes Frederic Sowa
<hannes@...essinduktion.org> wrote:
> On Tue, 2016-12-20 at 15:07 -0500, Josef Bacik wrote:
>> --- a/net/dccp/ipv6.c
>> +++ b/net/dccp/ipv6.c
>> @@ -926,7 +926,7 @@ static const struct inet_connection_sock_af_ops
>> dccp_ipv6_af_ops = {
>> .getsockopt = ipv6_getsockopt,
>> .addr2sockaddr = inet6_csk_addr2sockaddr,
>> .sockaddr_len = sizeof(struct sockaddr_in6),
>> - .bind_conflict = inet6_csk_bind_conflict,
>> + .rcv_saddr_equal = ipv6_rcv_saddr_equal,
>> #ifdef CONFIG_COMPAT
>> .compat_setsockopt = compat_ipv6_setsockopt,
>> .compat_getsockopt = compat_ipv6_getsockopt,
>>
>
> Btw, small nit, you forgot the corresponding changes in
> dccp_ipv6_mapped, thus causing this compiler error:
>
> net/dccp/ipv6.c:961:2: error: unknown field ‘bind_conflict’
> specified in initializer
> .bind_conflict = inet6_csk_bind_conflict,
> ^
> net/dccp/ipv6.c:961:22: error: ‘inet6_csk_bind_conflict’
> undeclared here (not in a function)
> .bind_conflict = inet6_csk_bind_conflict,
> ^~~~~~~~~~~~~~~~~~~~~~~
> scripts/Makefile.build:293: recipe for target 'net/dccp/ipv6.o' failed
Yeah kbuild caught that yesterday and I have it fixed up in my git tree
already, thanks,
Josef
Powered by blists - more mailing lists