[linux-yocto] [PATCH] ipv6: Fix expected expression before OR operand error

[Bruce Ashfield]

I've cherry picked the patch, and perf now builds for me.

Bruce

On 09/15/2017 07:32 AM, Dragomir Daniel wrote:
> Thanks Bruce!
> 
> What about the following error on perf do_compile?
> 
> util/string.c: In function 'perf_atoll':
> util/string.c:25:4: error: '__fallthrough' undeclared (first use in this 
> function)
> __fallthrough;
>      ^~~~~~~~~~~~~
> 
> Is there any patch staged for this one?
> 
> The patch which bring this error is:
> 
> commit 9de93e56698fe20998d085dccc9c3b20f673149a
> tools string: Use __fallthrough in perf_atoll()
> 
> The fix is also upstream signed off by the same author. See here:
> 
> https://patchwork.openembedded.org/patch/143863/
> 
> Regards,
> 
> Daniel
> 
> 
> 
> On 14.09.2017 19:08, Bruce Ashfield wrote:
>> I already have a fix staged for this one, the pushed commits
>> were only for testing purposes.
>>
>> Cheers,
>>
>> Bruce
>>
>> On 09/14/2017 12:14 PM, Daniel Dragomir wrote:
>>> Use parentheses for the entire condition for if statement.
>>> Error introduced by commit
>>> d27e21a ("udp: consistently apply ufo or fragmentation")
>>>
>>> | tmp/work-shared/axxiaarm64/kernel-source/net/ipv6/
>>> | ip6_output.c:1343:30: error: expected expression before '||' token
>>> | if (skb && skb_is_gso(skb)) ||
>>>
>>> Tested on branches: standard/axxia/base
>>> standard/preempt-rt/axxia/base
>>>
>>> Also affected: standard/base
>>> standard/preempt-rt/base
>>> and so on.
>>>
>>> Signed-off-by: Daniel Dragomir <daniel.dragomir at windriver.com>
>>> ---
>>>   net/ipv6/ip6_output.c | 4 ++--
>>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c
>>> index eb05df0..a6da5fa 100644
>>> --- a/net/ipv6/ip6_output.c
>>> +++ b/net/ipv6/ip6_output.c
>>> @@ -1340,12 +1340,12 @@ emsgsize:
>>>        */
>>>         cork->length += length;
>>> -    if (skb && skb_is_gso(skb)) ||
>>> +    if ((skb && skb_is_gso(skb)) ||
>>>           (((length > mtu) &&
>>>           (skb_queue_len(queue) <= 1) &&
>>>           (sk->sk_protocol == IPPROTO_UDP) &&
>>>           (rt->dst.dev->features & NETIF_F_UFO) &&
>>> -        (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk))) {
>>> +        (sk->sk_type == SOCK_DGRAM) && !udp_get_no_check6_tx(sk)))) {
>>>           err = ip6_ufo_append_data(sk, queue, getfrag, from, length,
>>>                         hh_len, fragheaderlen,
>>>                         transhdrlen, mtu, flags, rt);
>>>
>>
>