All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/1] net: s2io: simplify logical constraint
@ 2016-07-31  9:53 Heinrich Schuchardt
  2016-08-01 16:15 ` Jon Mason
  2016-08-01 20:44 ` David Miller
  0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2016-07-31  9:53 UTC (permalink / raw)
  To: Jon Mason; +Cc: netdev, linux-kernel, Heinrich Schuchardt

(!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

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] net: s2io: simplify logical constraint
  2016-07-31  9:53 [PATCH 1/1] net: s2io: simplify logical constraint Heinrich Schuchardt
@ 2016-08-01 16:15 ` Jon Mason
  2016-08-01 20:44 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: Jon Mason @ 2016-08-01 16:15 UTC (permalink / raw)
  To: Heinrich Schuchardt; +Cc: netdev, linux-kernel

On Sun, Jul 31, 2016 at 5:53 AM, Heinrich Schuchardt <xypron.glpk@gmx.de> wrote:
> (!A || (A && B)) is equivalent to (!A || B)

Seems logical to me.

Acked-by: Jon Mason <jdmason@kudzu.us>

> 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
>

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH 1/1] net: s2io: simplify logical constraint
  2016-07-31  9:53 [PATCH 1/1] net: s2io: simplify logical constraint Heinrich Schuchardt
  2016-08-01 16:15 ` Jon Mason
@ 2016-08-01 20:44 ` David Miller
  1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-08-01 20:44 UTC (permalink / raw)
  To: xypron.glpk; +Cc: jdmason, netdev, linux-kernel

From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Sun, 31 Jul 2016 11:53:57 +0200

> (!A || (A && B)) is equivalent to (!A || B)
> 
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

Applied.

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-08-01 20:46 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-31  9:53 [PATCH 1/1] net: s2io: simplify logical constraint Heinrich Schuchardt
2016-08-01 16:15 ` Jon Mason
2016-08-01 20:44 ` David Miller

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.