diff options
| author |   xypron.glpk@gmx.de <xypron.glpk@gmx.de> | 2016-07-31 11:53:57 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-08-01 13:32:52 -0700 |
| commit | 6d85a1bf4fd32e2e639e88a418f7c0e85e78659a (patch) | |
| tree | 95d8f7ab6c553fe998b5aa5275a2be7ba1e6abea /drivers/net | |
| parent | net: enic: use correct type specifier (diff) | |
| download | linux-dev-6d85a1bf4fd32e2e639e88a418f7c0e85e78659a.tar.xz linux-dev-6d85a1bf4fd32e2e639e88a418f7c0e85e78659a.zip | |
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/net')
| -rw-r--r-- | drivers/net/ethernet/neterion/s2io.c | 2 |
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); |