From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756741Ab0JHJcK (ORCPT ); Fri, 8 Oct 2010 05:32:10 -0400 Received: from webhosting01.bon.m2soft.com ([195.38.20.32]:60693 "EHLO webhosting01.bon.m2soft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754804Ab0JHJcH (ORCPT ); Fri, 8 Oct 2010 05:32:07 -0400 Date: Fri, 8 Oct 2010 11:29:27 +0200 From: Nicolas Kaiser To: Matt Carlson Cc: Michael Chan , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net/tg3: simplify conditional Message-ID: <20101008112927.0ca949cf@absol.kitzblitz> Organization: - X-Face: "fF&[w2"Nws:JNH4'g|:gVhgGKLhj|X}}&w&V?]0=,7n`jy8D6e[Jh=7+ca|4~t5e[ItpL5 N'y~Mvi-vJm`"1T5fi1^b!&EG]6nW~C!FN},=$G?^U2t~n[3;u\"5-|~H{-5]IQ2 X-Mailer: Claws Mail (Linux) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Simplify: ((a && !b) || (!a && b)) => (a != b) Signed-off-by: Nicolas Kaiser --- drivers/net/tg3.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 16e1a95..714f0fb 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -9967,8 +9967,7 @@ static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam if (!(phydev->supported & SUPPORTED_Pause) || (!(phydev->supported & SUPPORTED_Asym_Pause) && - ((epause->rx_pause && !epause->tx_pause) || - (!epause->rx_pause && epause->tx_pause)))) + (epause->rx_pause != epause->tx_pause))) return -EINVAL; tp->link_config.flowctrl = 0; -- 1.7.2.2