The following commit has been merged in the master branch: commit a2a260389ea0a902479430594361eaa23b584b26 Author: David Decotigny decot@google.com Date: Wed May 4 10:25:32 2011 +0200

batman-adv: cosmetic: Use ethtool ethtool_cmd_speed API

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 decot@google.com Signed-off-by: David S. Miller davem@davemloft.net [sven@narfation.org: compat function added] Signed-off-by: Sven Eckelmann sven@narfation.org

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 7717d62..f48bc67 100644 --- a/soft-interface.c +++ b/soft-interface.c @@ -897,7 +897,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;