projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8d546f5
)
net: s2io: simplify logical constraint
author
xypron.glpk@gmx.de
<xypron.glpk@gmx.de>
Sun, 31 Jul 2016 09:53:57 +0000
(11:53 +0200)
committer
David S. Miller
<davem@davemloft.net>
Mon, 1 Aug 2016 20:32:52 +0000
(13:32 -0700)
(!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>
drivers/net/ethernet/neterion/s2io.c
patch
|
blob
|
history
diff --git
a/drivers/net/ethernet/neterion/s2io.c
b/drivers/net/ethernet/neterion/s2io.c
index
2874dff
..
eaa37c0
100644
(file)
--- 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);