[PATCH net-next v4 15/19] net: bridge: use __ethtool_get_ksettings

From	David Decotigny <ddecotig@gmail.com>
Newsgroups	linux.kernel
Subject	[PATCH net-next v4 15/19] net: bridge: use __ethtool_get_ksettings
Date	2015-12-09 19:10 +0100
Message-ID	<qDRlD-3nA-1@gated-at.bofh.it> (permalink)
References	<qDRlD-3nA-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

From: David Decotigny <decot@googlers.com>

Signed-off-by: David Decotigny <decot@googlers.com>
---
 net/bridge/br_if.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c
index 8d1d4a2..d1022fd 100644
--- a/net/bridge/br_if.c
+++ b/net/bridge/br_if.c
@@ -36,10 +36,10 @@
  */
 static int port_cost(struct net_device *dev)
 {
-	struct ethtool_cmd ecmd;
+	struct ethtool_ksettings ecmd;
 
-	if (!__ethtool_get_settings(dev, &ecmd)) {
-		switch (ethtool_cmd_speed(&ecmd)) {
+	if (!__ethtool_get_ksettings(dev, &ecmd)) {
+		switch (ecmd.parent.speed) {
 		case SPEED_10000:
 			return 2;
 		case SPEED_1000:
-- 
2.6.0.rc2.230.g3dd15c0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH net-next v4 15/19] net: bridge: use __ethtool_get_ksettings David Decotigny <ddecotig@gmail.com> - 2015-12-09 19:10 +0100

csiph-web