summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorxypron.glpk@gmx.de <xypron.glpk@gmx.de>2016-07-31 11:53:57 +0200
committerDavid S. Miller <davem@davemloft.net>2016-08-01 13:32:52 -0700
commit6d85a1bf4fd32e2e639e88a418f7c0e85e78659a (patch)
tree95d8f7ab6c553fe998b5aa5275a2be7ba1e6abea /drivers
parent8d546f58ec441d1377457b2134fb27ba2455d9f8 (diff)
downloadlinux-6d85a1bf4fd32e2e639e88a418f7c0e85e78659a.tar.bz2
net: s2io: simplify logical constraint
(!A || (A && B)) is equivalent to (!A || B) Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/neterion/s2io.c2
1 files changed, 1 insertions, 1 deletions
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);