From patchwork Thu Apr 28 01:27:22 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: david decotigny X-Patchwork-Id: 93153 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 972B31007D7 for ; Thu, 28 Apr 2011 11:30:06 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756528Ab1D1B1w (ORCPT ); Wed, 27 Apr 2011 21:27:52 -0400 Received: from smtp-out.google.com ([216.239.44.51]:27029 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751905Ab1D1B1v (ORCPT ); Wed, 27 Apr 2011 21:27:51 -0400 Received: from kpbe15.cbf.corp.google.com (kpbe15.cbf.corp.google.com [172.25.105.79]) by smtp-out.google.com with ESMTP id p3S1RVEe009718; Wed, 27 Apr 2011 18:27:31 -0700 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=google.com; s=beta; t=1303954051; bh=XyVBaGy01t0vNC76Ear1LmjyDNY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References; b=eqpKKYXakdQZz8TrToL7mZ5C/Bko8Vnhv0RIcymAow+fdGZhMh14s232rAj8g6euy ALvqF8GlMLGYVyOkwM+DA== DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to: references:organization; b=Vdkf5frobuGBkF+0wqDtUuxDaf6xP7GvGtwa02jK1LfTPFfakA41NAITHLhGJAH1T pb4rJl+nx6zWnqkDVJ3kQ== Received: from decotigny.mtv.corp.google.com (decotigny.mtv.corp.google.com [172.18.124.45]) by kpbe15.cbf.corp.google.com with ESMTP id p3S1RT3f032126; Wed, 27 Apr 2011 18:27:29 -0700 Received: by decotigny.mtv.corp.google.com (Postfix, from userid 128857) id 0BEE123C58; Wed, 27 Apr 2011 18:27:27 -0700 (PDT) From: David Decotigny To: "David S. Miller" , Ben Hutchings , mirq-linux@rere.qmqm.pl, Stanislaw Gruszka , Alexander Duyck , Eilon Greenstein , Grant Grundler , e1000-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, netdev@vger.kernel.org Cc: David Decotigny Subject: [PATCHv3 6/7] tulip/de2104x: don't report different speeds depending on port type Date: Wed, 27 Apr 2011 18:27:22 -0700 Message-Id: <1303954043-17440-7-git-send-email-decot@google.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1303954043-17440-1-git-send-email-decot@google.com> References: <1303954043-17440-1-git-send-email-decot@google.com> Organization: Google, Inc. Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Initial driver reports different speeds depending on the port being used. This patch advertises the speed to be 10Mbps in any case, which is what it actually is on the wire. Signed-off-by: David Decotigny Reviewed-by: Ben Hutchings --- drivers/net/tulip/de2104x.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index ab78e1d..46d5a1b 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c @@ -1518,18 +1518,17 @@ static int __de_get_settings(struct de_private *de, struct ethtool_cmd *ecmd) switch (de->media_type) { case DE_MEDIA_AUI: ecmd->port = PORT_AUI; - ethtool_cmd_speed_set(ecmd, 5); break; case DE_MEDIA_BNC: ecmd->port = PORT_BNC; - ethtool_cmd_speed_set(ecmd, 2); break; default: ecmd->port = PORT_TP; - ethtool_cmd_speed_set(ecmd, SPEED_10); break; } + ethtool_cmd_speed_set(ecmd, 10); + if (dr32(MacMode) & FullDuplex) ecmd->duplex = DUPLEX_FULL; else @@ -1549,11 +1548,8 @@ static int __de_set_settings(struct de_private *de, struct ethtool_cmd *ecmd) { u32 new_media; unsigned int media_lock; - u32 speed = ethtool_cmd_speed(ecmd); - if (speed != SPEED_10 && speed != 5 && speed != 2) - return -EINVAL; - if (de->de21040 && speed == 2) + if (ethtool_cmd_speed(ecmd) != 10) return -EINVAL; if (ecmd->duplex != DUPLEX_HALF && ecmd->duplex != DUPLEX_FULL) return -EINVAL;