Re: [PATCH net-next] net: Fix typo in netdev_intersect_features

[Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>]

Hello.

On 01/11/2016 09:19 PM, Tom Herbert wrote:

> Obviously need to 'or in NETIF_F_IP_CSUM and NETIF_F_IPV6_CSUM.
>
> Fixes: c8cd0989bd151f ("net: Eliminate NETIF_F_GEN_CSUM and NETIF_F_V[46]_CSUM")
> Reported-by: Jack Morgenstein <jackm@dev.mellanox.co.il>
> Signed-off-by: Tom Herbert <tom@herbertland.com>
> ---
>   include/linux/netdevice.h | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
> index 8d8e5ca..a951274 100644
> --- a/include/linux/netdevice.h
> +++ b/include/linux/netdevice.h
> @@ -3871,9 +3871,9 @@ static inline netdev_features_t netdev_intersect_features(netdev_features_t f1,
>   {
>   	if ((f1 ^ f2) & NETIF_F_HW_CSUM) {
>   		if (f1 & NETIF_F_HW_CSUM)
> -			f1 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);
> +			f1 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);
>   		else
> -			f2 |= (NETIF_F_IP_CSUM|NETIF_F_IP_CSUM);
> +			f2 |= (NETIF_F_IP_CSUM|NETIF_F_IPV6_CSUM);

    The general kernel coding style is to have the operators surrounded by spaces.

[...]

WBR, Sergei