From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754257AbcHAQeg (ORCPT ); Mon, 1 Aug 2016 12:34:36 -0400 Received: from mail-vk0-f65.google.com ([209.85.213.65]:34671 "EHLO mail-vk0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754170AbcHAQeW (ORCPT ); Mon, 1 Aug 2016 12:34:22 -0400 MIME-Version: 1.0 In-Reply-To: <1469958837-1044-1-git-send-email-xypron.glpk@gmx.de> References: <1469958837-1044-1-git-send-email-xypron.glpk@gmx.de> From: Jon Mason Date: Mon, 1 Aug 2016 12:15:55 -0400 Message-ID: Subject: Re: [PATCH 1/1] net: s2io: simplify logical constraint To: Heinrich Schuchardt Cc: netdev , linux-kernel Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sun, Jul 31, 2016 at 5:53 AM, Heinrich Schuchardt wrote: > (!A || (A && B)) is equivalent to (!A || B) Seems logical to me. Acked-by: Jon Mason > Signed-off-by: Heinrich Schuchardt > --- > 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 >