From patchwork Sun Jan 31 12:58:33 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Mohr X-Patchwork-Id: 44116 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.180.67]) by ozlabs.org (Postfix) with ESMTP id CD3BEB7D68 for ; Sun, 31 Jan 2010 23:58:49 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753401Ab0AaM6g (ORCPT ); Sun, 31 Jan 2010 07:58:36 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753407Ab0AaM6f (ORCPT ); Sun, 31 Jan 2010 07:58:35 -0500 Received: from rhlx01.hs-esslingen.de ([129.143.116.10]:60162 "EHLO rhlx01.hs-esslingen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753397Ab0AaM6e (ORCPT ); Sun, 31 Jan 2010 07:58:34 -0500 Received: by rhlx01.hs-esslingen.de (Postfix, from userid 102) id 686B040090; Sun, 31 Jan 2010 13:58:33 +0100 (CET) Date: Sun, 31 Jan 2010 13:58:33 +0100 From: Andreas Mohr To: David Miller , Arnd Bergmann , David Hollis , Phil Chang Cc: netdev@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH 3/4] MCS7830 USB-Ether: change register define Message-ID: <20100131125833.GC13435@rhlx01.hs-esslingen.de> MIME-Version: 1.0 Content-Disposition: inline X-Priority: none 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 ChangeLog: - rename register, add comment Signed-off-by: Andreas Mohr Index: linux-2.6.33-rc4/drivers/net/usb/mcs7830.c =================================================================== --- linux-2.6.33-rc4.orig/drivers/net/usb/mcs7830.c 2010-01-31 12:34:45.000000000 +0100 +++ linux-2.6.33-rc4/drivers/net/usb/mcs7830.c 2010-01-31 12:34:51.000000000 +0100 @@ -85,6 +85,7 @@ HIF_REG_PHY_CMD2_PEND_FLAG_BIT = 0x80, HIF_REG_PHY_CMD2_READY_FLAG_BIT = 0x40, HIF_REG_CONFIG = 0x0e, + /* hmm, spec sez: "R/W", "Except bit 3" (likely TXENABLE). */ HIF_REG_CONFIG_CFG = 0x80, HIF_REG_CONFIG_SPEED100 = 0x40, HIF_REG_CONFIG_FULLDUPLEX_ENABLE = 0x20, @@ -94,7 +95,7 @@ HIF_REG_CONFIG_ALLMULTICAST = 0x02, HIF_REG_CONFIG_PROMISCUOUS = 0x01, HIF_REG_ETHERNET_ADDR = 0x0f, - HIF_REG_22 = 0x15, + HIF_REG_FRAME_DROP_COUNTER = 0x15, /* 0..ff; reset: 0 */ HIF_REG_PAUSE_THRESHOLD = 0x16, HIF_REG_PAUSE_THRESHOLD_DEFAULT = 0, }; @@ -334,7 +335,7 @@ { u8 dummy[2]; int ret; - ret = mcs7830_get_reg(dev, HIF_REG_22, 2, dummy); + ret = mcs7830_get_reg(dev, HIF_REG_FRAME_DROP_COUNTER, 2, dummy); if (ret > 0) return 2; /* Rev C or later */ return 1; /* earlier revision */