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

From	Heinrich Schuchardt <xypron.glpk@gmx.de>
Newsgroups	linux.kernel
Subject	[PATCH 1/1] net: s2io: simplify logical constraint
Date	2016-07-31 12:00 +0200
Message-ID	<s0VHk-6Rl-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

(!A || (A && B)) is equivalent to (!A || B)

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

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/1] net: s2io: simplify logical constraint Heinrich Schuchardt <xypron.glpk@gmx.de> - 2016-07-31 12:00 +0200
  Re: [PATCH 1/1] net: s2io: simplify logical constraint Jon Mason <jdmason@kudzu.us> - 2016-08-01 18:40 +0200
  Re: [PATCH 1/1] net: s2io: simplify logical constraint David Miller <davem@davemloft.net> - 2016-08-01 22:50 +0200

csiph-web