From patchwork Thu Mar 5 18:01:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ayaz Abdulla X-Patchwork-Id: 24115 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 9428CDDEF3 for ; Fri, 6 Mar 2009 08:01:13 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755222AbZCEVBH (ORCPT ); Thu, 5 Mar 2009 16:01:07 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751439AbZCEVBG (ORCPT ); Thu, 5 Mar 2009 16:01:06 -0500 Received: from hqemgate03.nvidia.com ([216.228.112.145]:8374 "EHLO hqemgate03.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755132AbZCEVBC (ORCPT ); Thu, 5 Mar 2009 16:01:02 -0500 Received: from hqnvupgp03.nvidia.com (Not Verified[172.17.102.18]) by hqemgate03.nvidia.com id ; Thu, 05 Mar 2009 13:00:37 -0800 Received: from hqemfe02.nvidia.com ([172.17.108.22]) by hqnvupgp03.nvidia.com (PGP Universal service); Thu, 05 Mar 2009 13:00:31 -0800 X-PGP-Universal: processed; by hqnvupgp03.nvidia.com on Thu, 05 Mar 2009 13:00:31 -0800 Received: from [172.16.138.241] ([172.17.108.22]) by hqemfe02.nvidia.com with Microsoft SMTPSVC(6.0.3790.3959); Thu, 5 Mar 2009 13:00:27 -0800 Message-ID: <49B0138D.9000309@nvidia.com> Date: Thu, 05 Mar 2009 13:01:49 -0500 From: Ayaz Abdulla User-Agent: Mozilla Thunderbird 1.0.2-6 (X11/20050513) X-Accept-Language: en-us, en MIME-Version: 1.0 To: Manfred Spraul , Jeff Garzik , Andrew Morton , "David S. Miller" , nedev Subject: [PATCH 1/13] forcedeth: fix stats version feature X-NVConfidentiality: public X-OriginalArrivalTime: 05 Mar 2009 21:00:27.0573 (UTC) FILETIME=[69395650:01C99DD5] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Newer versions of the stats feature would not encompass all older versions. This would result in only retreiving a subset of all available stats in HW. Signed-off-by: Ayaz Abdulla --- old/drivers/net/forcedeth.c 2009-03-04 21:55:19.000000000 -0800 +++ new/drivers/net/forcedeth.c 2009-03-04 21:55:10.000000000 -0800 @@ -87,8 +87,8 @@ #define DEV_HAS_MSI_X 0x000080 /* device supports MSI-X */ #define DEV_HAS_POWER_CNTRL 0x000100 /* device supports power savings */ #define DEV_HAS_STATISTICS_V1 0x000200 /* device supports hw statistics version 1 */ -#define DEV_HAS_STATISTICS_V2 0x000400 /* device supports hw statistics version 2 */ -#define DEV_HAS_STATISTICS_V3 0x000800 /* device supports hw statistics version 3 */ +#define DEV_HAS_STATISTICS_V2 0x000600 /* device supports hw statistics version 2 */ +#define DEV_HAS_STATISTICS_V3 0x000e00 /* device supports hw statistics version 3 */ #define DEV_HAS_TEST_EXTENDED 0x001000 /* device supports extended diagnostic test */ #define DEV_HAS_MGMT_UNIT 0x002000 /* device supports management unit */ #define DEV_HAS_CORRECT_MACADDR 0x004000 /* device supports correct mac address order */ @@ -4796,12 +4796,12 @@ else return NV_TEST_COUNT_BASE; case ETH_SS_STATS: - if (np->driver_data & DEV_HAS_STATISTICS_V1) - return NV_DEV_STATISTICS_V1_COUNT; + if (np->driver_data & DEV_HAS_STATISTICS_V3) + return NV_DEV_STATISTICS_V3_COUNT; else if (np->driver_data & DEV_HAS_STATISTICS_V2) return NV_DEV_STATISTICS_V2_COUNT; - else if (np->driver_data & DEV_HAS_STATISTICS_V3) - return NV_DEV_STATISTICS_V3_COUNT; + else if (np->driver_data & DEV_HAS_STATISTICS_V1) + return NV_DEV_STATISTICS_V1_COUNT; else return 0; default: