From patchwork Sun Jul 31 09:53:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Heinrich Schuchardt X-Patchwork-Id: 654337 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3s2HqR6MJKz9t0V for ; Sun, 31 Jul 2016 19:54:11 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753278AbcGaJyJ (ORCPT ); Sun, 31 Jul 2016 05:54:09 -0400 Received: from mout.gmx.net ([212.227.17.21]:54070 "EHLO mout.gmx.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751338AbcGaJyF (ORCPT ); Sun, 31 Jul 2016 05:54:05 -0400 Received: from LT002.fritz.box ([109.91.48.91]) by mail.gmx.com (mrgmx101) with ESMTPSA (Nemesis) id 0M3vCA-1bCXTX2f4s-00rXEZ; Sun, 31 Jul 2016 11:54:01 +0200 From: Heinrich Schuchardt To: Jon Mason Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Heinrich Schuchardt Subject: [PATCH 1/1] net: s2io: simplify logical constraint Date: Sun, 31 Jul 2016 11:53:57 +0200 Message-Id: <1469958837-1044-1-git-send-email-xypron.glpk@gmx.de> X-Mailer: git-send-email 2.8.1 X-Provags-ID: V03:K0:rglWF83akvbZpI5/aWb0WoaWl3qd4VR/KKoTMdaMKK44vKMMz6L j3/XQg1wDElFPyBMMsIfRZmE6juex2Uie2Ca5tDOc2I6PgQq6ydK4d09EgyCg5cFw+vDH+C CJ8q6rqJMjNkVoq8LxJmC1Fo3CjE/jcT89dKZ8wXxF1FifK6XZnkn7N/6UTqHaEq0GxVbNp N0gBBJJGW6A6E4iIzFvjw== X-UI-Out-Filterresults: notjunk:1; V01:K0:ArJiuQzjN5A=:CG24xpboFsGVwwTjjXfb9F qZnQuJAC/juuNZBd+wCpHIcaxqIkwQ/C5MDye9Aml9GsrPC+Ec8u36ZsR4Vskec2wr1GuX/dD Xk8dT8zp6LrJDqBYsBR8t9+ZBdv2vArCYOW2lsO76cd0LcxY/fO9sKi/Yl8lLOe5hZVIeJsjQ ZdfOwARX5pvkcieMMgA/D4vY4f2W+ZZvPhuO5CYw7hwfXU4NwJbFHAAJ9bxrywWQWCfD31yBc H/DLdXqPGIKTYO2TrL6nZyS6jw9pwtqbhLGaJZlO99VaRXUXp0kkwJg87w7qZe94SldvZz4Uh WptiRAnjIN9NoaXBjZIdHOYDIpjn0T6hcn1KK8y3eKxD663gaatPXwn3Ib1bQolfkG4hiyrIf Fyi/5PvNp5KWkAL0xy8UVegX8oovB1nIzMVt+48d9OrfF3GHrhUPeCBzd5zUWbRha8iRVu6XP TEzbe+jL3tOFk1bpN/dp91ZvSICMmzyZBTYZND1vBMvtB22S2612AN7tpqlSxhnVZQiHRMfNj T6FEN/DTGgRnbBPL0p6qOgf095FHfwo7bTklk+Tfn8Gi+LP2g5tIJyY/AJpqnXalAM0bGqsZy O/5KtHt5L2oW5HFKwsSo0nyczxKL0olfBXzL93Yn1P+ICtrEIznSvj+/F0FKpGxAwXgZUXAv3 C6yBvzyJSBlZbWCGDBPmPgpW7z+lnpZe08zT5bhybx0Ox5L2VLLMSqxRqRUnvsfitZJs3pShX P3CfFmLTj5g6RcHTgP4lPJZl37jVJz0aMkS63zs1eke+YCWdTHlgMlaE5Ts= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org (!A || (A && B)) is equivalent to (!A || B) 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);