From patchwork Sun Feb 15 22:17:56 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: roel kluin X-Patchwork-Id: 23198 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 814C3DDDA2 for ; Mon, 16 Feb 2009 09:18:03 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752960AbZBOWR5 (ORCPT ); Sun, 15 Feb 2009 17:17:57 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752803AbZBOWR5 (ORCPT ); Sun, 15 Feb 2009 17:17:57 -0500 Received: from mail-ew0-f21.google.com ([209.85.219.21]:38285 "EHLO mail-ew0-f21.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752691AbZBOWR4 (ORCPT ); Sun, 15 Feb 2009 17:17:56 -0500 Received: by ewy14 with SMTP id 14so1687547ewy.13 for ; Sun, 15 Feb 2009 14:17:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from :user-agent:mime-version:to:cc:subject:references:in-reply-to :content-type:content-transfer-encoding; bh=3JIPmmramzmvuIkkTCTzzqQ4m8v3AJAkclMVTdJKO0Y=; b=uApIdKulLc0PGnmGNlsoa9G0ntVDrUxIkKCgw8aa6Eotv4b/Dif5cFVSEoHDX8E+kQ y+pOm9HX7LKEfGOCZdKLXbpXhvIU4leXvRkIeJv0p8B4VdLiAN6WHoyJL303O6EG6r21 56pG+siLtOQnj8PEo2aMP/6XhWo5p4qu9bNjQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=UfJPhlIhtSFAQRyO1Wy7dnm7cy/GtJiHjm/HgkjLNMD7mSSahS6eCpDXcOIx0LZl31 QKeFTUapaglsV7fLRDUj9DmzTz4FZ8V0THLrUEuSIo7JzgR7RVjJok2VE3I5LrRqOVVy F6igdQAHT9VXFB4j8jYZo4j0iyON65viGP+iU= Received: by 10.210.87.19 with SMTP id k19mr3132997ebb.152.1234736274672; Sun, 15 Feb 2009 14:17:54 -0800 (PST) Received: from ?192.168.1.115? (d133062.upc-d.chello.nl [213.46.133.62]) by mx.google.com with ESMTPS id 28sm10775702eyg.55.2009.02.15.14.17.54 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 15 Feb 2009 14:17:54 -0800 (PST) Message-ID: <49989494.6010804@gmail.com> Date: Sun, 15 Feb 2009 23:17:56 +0100 From: Roel Kluin User-Agent: Thunderbird 2.0.0.18 (X11/20081105) MIME-Version: 1.0 To: mchan@broadcom.com CC: netdev@vger.kernel.org, Andrew Morton Subject: [PATCH] TG3: &&/|| confusion References: <4992AD3A.7000301@gmail.com> In-Reply-To: <4992AD3A.7000301@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org phyid Can't be both TG3_PHY_OUI_1 and TG3_PHY_OUI_2 and TG3_PHY_OUI_3. Signed-off-by: Roel Kluin Acked-by: Matt Carlson --- // vi drivers/net/tg3.h +2698 #define TG3_PHY_OUI_1 0x00206000 #define TG3_PHY_OUI_2 0x0143bc00 #define TG3_PHY_OUI_3 0x03625c00 -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 4595962..b080f94 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -2237,8 +2237,8 @@ static int tg3_set_power_state(struct tg3 *tp, pci_power_t state) phyid = phydev->drv->phy_id & phydev->drv->phy_id_mask; if (phyid != TG3_PHY_ID_BCMAC131) { phyid &= TG3_PHY_OUI_MASK; - if (phyid == TG3_PHY_OUI_1 && - phyid == TG3_PHY_OUI_2 && + if (phyid == TG3_PHY_OUI_1 || + phyid == TG3_PHY_OUI_2 || phyid == TG3_PHY_OUI_3) do_low_power = true; }