From patchwork Tue Aug 11 05:42:37 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francois Romieu X-Patchwork-Id: 31133 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 1478CB6EDE for ; Tue, 11 Aug 2009 21:51:28 +1000 (EST) Received: by ozlabs.org (Postfix) id 02B71DDD1B; Tue, 11 Aug 2009 21:51:28 +1000 (EST) 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 6A49BDDD01 for ; Tue, 11 Aug 2009 21:51:27 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750943AbZHKLvE (ORCPT ); Tue, 11 Aug 2009 07:51:04 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750905AbZHKLvD (ORCPT ); Tue, 11 Aug 2009 07:51:03 -0400 Received: from electric-eye.fr.zoreil.com ([213.41.134.224]:60940 "EHLO electric-eye.fr.zoreil.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750847AbZHKLvA (ORCPT ); Tue, 11 Aug 2009 07:51:00 -0400 Received: from electric-eye.fr.zoreil.com (localhost.localdomain [127.0.0.1]) by electric-eye.fr.zoreil.com (8.14.2/8.14.1) with ESMTP id n7B5gcGj017129; Tue, 11 Aug 2009 07:42:38 +0200 Received: (from romieu@localhost) by electric-eye.fr.zoreil.com (8.14.2/8.14.2/Submit) id n7B5gbOF017128; Tue, 11 Aug 2009 07:42:37 +0200 Date: Tue, 11 Aug 2009 07:42:37 +0200 From: Francois Romieu To: "David S. Miller" Cc: edward_hsu@realtek.com.tw, netdev@vger.kernel.org Subject: [PATCH net-next 2/6] r8169: differentiate close chipsets in the startup identification message Message-ID: <20090811054236.GC16446@electric-eye.fr.zoreil.com> References: <20090811054039.GA16446@electric-eye.fr.zoreil.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090811054039.GA16446@electric-eye.fr.zoreil.com> X-Organisation: Land of Sunshine Inc. User-Agent: Mutt/1.5.18 (2008-05-17) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The driver displays the same 0x18000000 xid for RTL_GIGA_MAC_VER_06 and RTL_GIGA_MAC_VER_05 whereas the former ought to be identified as 0x98000000. Signed-off-by: Francois Romieu Cc: Edward Hsu --- drivers/net/r8169.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c index eac882b..6c4b879 100644 --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c @@ -2180,7 +2180,7 @@ rtl8169_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) pci_set_drvdata(pdev, dev); if (netif_msg_probe(tp)) { - u32 xid = RTL_R32(TxConfig) & 0x7cf0f8ff; + u32 xid = RTL_R32(TxConfig) & 0x9cf0f8ff; printk(KERN_INFO "%s: %s at 0x%lx, " "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x, "