From patchwork Wed May 4 08:25:32 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sven Eckelmann X-Patchwork-Id: 1010 Return-Path: Received: from v3-1039.vlinux.de (narfation.org [79.140.41.39]) by open-mesh.org (Postfix) with ESMTPS id 2F8241542F5 for ; Wed, 4 May 2011 10:25:36 +0200 (CEST) Authentication-Results: open-mesh.org; dkim=pass (1024-bit key) header.i=@narfation.org; dkim-adsp=pass Received: from sven-desktop.home.narfation.org (bathseba.informatik.tu-chemnitz.de [134.109.192.185]) by v3-1039.vlinux.de (Postfix) with ESMTPSA id AAD9B940CF for ; Wed, 4 May 2011 10:25:48 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=narfation.org; s=mail; t=1304497548; bh=XeudqxEmhrdo3C6iXmp+mXDiBOJrbdchF39hp65S5nE=; h=From:To:Subject:Date:Message-Id; b=Zjr2O6LFGnwrPnyd3kQEn4GPQh9diuaJrXy12W0azQMK3A102vf09RfzNQQkDHPLL zshjcfShFMFufY+MViDG0KDtuc1/9KKc7NdDJ7dP8xdomxuyEtV5uTEsGMcmd1riAv +e9XTwcSBgkQbDeNSkWX+rnSAodYhMZi6C4nRE/A= From: Sven Eckelmann To: b.a.t.m.a.n@lists.open-mesh.org Date: Wed, 4 May 2011 10:25:32 +0200 Message-Id: <1304497532-16946-1-git-send-email-sven@narfation.org> X-Mailer: git-send-email 1.7.4.4 Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: cosmetic: Use ethtool ethtool_cmd_speed API X-BeenThere: b.a.t.m.a.n@lists.open-mesh.org X-Mailman-Version: 2.1.13 Precedence: list Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 May 2011 08:25:36 -0000 From: David Decotigny This updates the network drivers so that they don't access the ethtool_cmd::speed field directly, but use ethtool_cmd_speed() instead. For most of the drivers, these changes are purely cosmetic and don't fix any problem, such as for those 1GbE/10GbE drivers that indirectly call their own ethtool get_settings()/mii_ethtool_gset(). The changes are meant to enforce code consistency and provide robustness with future larger throughputs, at the expense of a few CPU cycles for each ethtool operation. All drivers compiled with make allyesconfig ion x86_64 have been updated. Tested: make allyesconfig on x86_64 + e1000e/bnx2x work Signed-off-by: David Decotigny Signed-off-by: David S. Miller [sven@narfation.org: compat function added] Signed-off-by: Sven Eckelmann --- This patch is now part of net-next-2.6 and will be in linux 2.6.40 compat.h | 3 +++ soft-interface.c | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/compat.h b/compat.h index 0c5ad82..c3fd2cd 100644 --- a/compat.h +++ b/compat.h @@ -183,6 +183,9 @@ static inline char *pack_hex_byte(char *buf, u8 byte) #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) +#define ethtool_cmd_speed_set(_ep, _speed) \ + do { (_ep)->speed = (_speed); } while (0) + #ifndef dereference_function_descriptor #define dereference_function_descriptor(p) (p) #endif diff --git a/soft-interface.c b/soft-interface.c index 1772e2b..9e5fcd1 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -723,7 +723,7 @@ static int bat_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) { cmd->supported = 0; cmd->advertising = 0; - cmd->speed = SPEED_10; + ethtool_cmd_speed_set(cmd, SPEED_10); cmd->duplex = DUPLEX_FULL; cmd->port = PORT_TP; cmd->phy_address = 0;