From patchwork Thu Apr 30 12:36:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 26680 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 D84D4B6F56 for ; Thu, 30 Apr 2009 22:36:58 +1000 (EST) Received: by ozlabs.org (Postfix) id CA855DDF87; Thu, 30 Apr 2009 22:36:58 +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 63C43DDF7A for ; Thu, 30 Apr 2009 22:36:58 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762257AbZD3Mgz (ORCPT ); Thu, 30 Apr 2009 08:36:55 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762036AbZD3Mgx (ORCPT ); Thu, 30 Apr 2009 08:36:53 -0400 Received: from smarthost02.mail.zen.net.uk ([212.23.3.141]:40195 "EHLO smarthost02.mail.zen.net.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761809AbZD3Mgw (ORCPT ); Thu, 30 Apr 2009 08:36:52 -0400 Received: from [82.69.137.158] (helo=opal.uk.level5networks.com) by smarthost02.mail.zen.net.uk with esmtp (Exim 4.63) (envelope-from ) id 1LzVVS-0003cf-Fa; Thu, 30 Apr 2009 12:36:50 +0000 Received: from [10.17.20.50] (achroite.uk.level5networks.com [10.17.20.50]) by opal.uk.level5networks.com (8.12.8/8.12.8) with ESMTP id n3UCanXx030023; Thu, 30 Apr 2009 13:36:49 +0100 Subject: [PATCH 1/5] ethtool: Remove support for RX hashing by port From: Ben Hutchings To: Jeff Garzik Cc: netdev In-Reply-To: <1241094796.3185.2.camel@achroite> References: <1241094796.3185.2.camel@achroite> Organization: Solarflare Communications Date: Thu, 30 Apr 2009 13:36:49 +0100 Message-Id: <1241095009.3185.7.camel@achroite> Mime-Version: 1.0 X-Mailer: Evolution 2.22.1 (2.22.1-2.fc9) X-Originating-Smarthost02-IP: [82.69.137.158] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The kernel-side support for this was removed by: commit 59089d8d162ddcb5c434672e915331964d38a754 Author: Santwona Behera Date: Fri Feb 20 00:58:13 2009 -0800 ethtool: Add RX pkt classification interface Signed-off-by: Ben Hutchings --- ethtool.8 | 3 --- ethtool.c | 8 +------- 2 files changed, 1 insertions(+), 10 deletions(-) diff --git a/ethtool.8 b/ethtool.8 index 178f6ea..7a6f52b 100644 --- a/ethtool.8 +++ b/ethtool.8 @@ -473,9 +473,6 @@ Configures the hash options for the specified network traffic type. .RS .PD 0 .TP 3 -.B p -Hash on the device port number on which the packet was received. -.TP 3 .B m Hash on the Layer 2 destination address of the rx packet. .TP 3 diff --git a/ethtool.c b/ethtool.c index 43ec2bf..5c45b2d 100644 --- a/ethtool.c +++ b/ethtool.c @@ -191,7 +191,7 @@ static struct option { { "-N", "--config-nfc", MODE_SNFC, "Configure Rx network flow " "classification options", " [ rx-flow-hash tcp4|udp4|ah4|sctp4|" - "tcp6|udp6|ah6|sctp6 p|m|v|t|s|d|f|n|r... ]\n" }, + "tcp6|udp6|ah6|sctp6 m|v|t|s|d|f|n|r... ]\n" }, { "-h", "--help", MODE_HELP, "Show this help" }, {} }; @@ -1090,9 +1090,6 @@ static int parse_rxfhashopts(char *optstr, u32 *data) *data = 0; while (*optstr) { switch (*optstr) { - case 'p': - *data |= RXH_DEV_PORT; - break; case 'm': *data |= RXH_L2DA; break; @@ -1132,9 +1129,6 @@ static char *unparse_rxfhashopts(u64 opts) memset(buf, 0, sizeof(buf)); if (opts) { - if (opts & RXH_DEV_PORT) { - strcat(buf, "Dev port\n"); - } if (opts & RXH_L2DA) { strcat(buf, "L2DA\n"); }