From: xypron.glpk@gmx.de Date: Sun, 31 Jul 2016 09:53:57 +0000 (+0200) Subject: net: s2io: simplify logical constraint X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6d85a1bf4fd32e2e639e88a418f7c0e85e78659a;p=linux-beck.git net: s2io: simplify logical constraint (!A || (A && B)) is equivalent to (!A || B) Signed-off-by: Heinrich Schuchardt Signed-off-by: David S. Miller --- diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 2874dffe77de..eaa37c079a7c 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);