From 0086e5e7308ab3a0c5dafe7f27d3627acf7c4827 Mon Sep 17 00:00:00 2001 From: Jitendra Kalsaria Date: Thu, 18 Apr 2013 19:49:53 +0000 Subject: [PATCH] --- yaml --- r: 362663 b: refs/heads/master c: c5e991af93e37f1b5e166f0b8a9bb99dd29e8a24 h: refs/heads/master i: 362661: c4cfcc28db9e898bd4d82b9a216019ae94ce656b 362659: 2cfd8ff69780759384b51f657c9f773f6ebdebb4 362655: 9cffd1404e8ceb916a52d654980f16527a0bec9a v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5e4f4d31202a..5b0b60f2947b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ae721f3ab0d9234219edbc7858cf9c5ceda42df2 +refs/heads/master: c5e991af93e37f1b5e166f0b8a9bb99dd29e8a24 diff --git a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c index 6f316ab23257..0780e039b271 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c +++ b/trunk/drivers/net/ethernet/qlogic/qlge/qlge_ethtool.c @@ -379,13 +379,13 @@ static int ql_get_settings(struct net_device *ndev, ecmd->supported = SUPPORTED_10000baseT_Full; ecmd->advertising = ADVERTISED_10000baseT_Full; - ecmd->autoneg = AUTONEG_ENABLE; ecmd->transceiver = XCVR_EXTERNAL; if ((qdev->link_status & STS_LINK_TYPE_MASK) == STS_LINK_TYPE_10GBASET) { ecmd->supported |= (SUPPORTED_TP | SUPPORTED_Autoneg); ecmd->advertising |= (ADVERTISED_TP | ADVERTISED_Autoneg); ecmd->port = PORT_TP; + ecmd->autoneg = AUTONEG_ENABLE; } else { ecmd->supported |= SUPPORTED_FIBRE; ecmd->advertising |= ADVERTISED_FIBRE;