lkml.org 
[lkml]   [2016]   [Aug]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH 1/1] net: s2io: simplify logical constraint
On Sun, Jul 31, 2016 at 5:53 AM, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> (!A || (A && B)) is equivalent to (!A || B)

Seems logical to me.

Acked-by: Jon Mason <jdmason@kudzu.us>

> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
> 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
>

\
 
 \ /
  Last update: 2016-08-01 19:21    [W:0.058 / U:0.644 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site