Re: [PATCH 1/1] net: s2io: simplify logical constraint

[Jon Mason]

On Sun, Jul 31, 2016 at 5:53 AM, Heinrich Schuchardt <xypron.glpk@xxxxxx> wrote:
> (!A || (A && B)) is equivalent to (!A || B)

Seems logical to me.

Acked-by: Jon Mason <jdmason@xxxxxxxx>

> Signed-off-by: Heinrich Schuchardt <xypron.glpk@xxxxxx>
> ---
>  drivers/net/ethernet/neterion/s2io.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c
> index 2874dff..eaa37c0 100644
> --- a/drivers/net/ethernet/neterion/s2io.c
> +++ b/drivers/net/ethernet/neterion/s2io.c
> @@ -7412,7 +7412,7 @@ static int rx_osm_handler(struct ring_info *ring_data, struct RxD_t * rxdp)
>
>         if ((rxdp->Control_1 & TCP_OR_UDP_FRAME) &&
>             ((!ring_data->lro) ||
> -            (ring_data->lro && (!(rxdp->Control_1 & RXD_FRAME_IP_FRAG)))) &&
> +            (!(rxdp->Control_1 & RXD_FRAME_IP_FRAG))) &&
>             (dev->features & NETIF_F_RXCSUM)) {
>                 l3_csum = RXD_GET_L3_CKSUM(rxdp->Control_1);
>                 l4_csum = RXD_GET_L4_CKSUM(rxdp->Control_1);
> --
> 2.8.1
>