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

[Bruce Ashfield]

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);
>