From: "Matt Carlson" <mcarlson@broadcom.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, mcarlson@broadcom.com, bhutchings@solarflare.com
Subject: [PATCH RFC 2/2] tg3: Convert to get_pauseparamext
Date: Fri, 14 Oct 2011 13:54:02 -0700 [thread overview]
Message-ID: <1318625642-9668-3-git-send-email-mcarlson@broadcom.com> (raw)
This patch converts the tg3 driver to the get_pauseparamext ethtool
command.
Signed-off-by: Matt Carlson <mcarlson@broadcom.com>
---
drivers/net/ethernet/broadcom/tg3.c | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c
index fe712f9..a7b7ddd 100644
--- a/drivers/net/ethernet/broadcom/tg3.c
+++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -10576,24 +10576,36 @@ static int tg3_set_ringparam(struct net_device *dev, struct ethtool_ringparam *e
return err;
}
-static void tg3_get_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
+static void tg3_get_pauseparamext(struct net_device *dev,
+ struct ethtool_pauseparamext *epause)
{
struct tg3 *tp = netdev_priv(dev);
- epause->autoneg = !!tg3_flag(tp, PAUSE_AUTONEG);
+ epause->cfg.autoneg = !!tg3_flag(tp, PAUSE_AUTONEG);
+
+ if (tp->link_config.flowctrl & FLOW_CTRL_RX)
+ epause->cfg.rx_pause = 1;
+ else
+ epause->cfg.rx_pause = 0;
+
+ if (tp->link_config.flowctrl & FLOW_CTRL_TX)
+ epause->cfg.tx_pause = 1;
+ else
+ epause->cfg.tx_pause = 0;
if (tp->link_config.active_flowctrl & FLOW_CTRL_RX)
- epause->rx_pause = 1;
+ epause->rx_pause_status = 1;
else
- epause->rx_pause = 0;
+ epause->rx_pause_status = 0;
if (tp->link_config.active_flowctrl & FLOW_CTRL_TX)
- epause->tx_pause = 1;
+ epause->tx_pause_status = 1;
else
- epause->tx_pause = 0;
+ epause->tx_pause_status = 0;
}
-static int tg3_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam *epause)
+static int tg3_set_pauseparam(struct net_device *dev,
+ struct ethtool_pauseparam *epause)
{
struct tg3 *tp = netdev_priv(dev);
int err = 0;
@@ -11926,7 +11938,7 @@ static const struct ethtool_ops tg3_ethtool_ops = {
.set_eeprom = tg3_set_eeprom,
.get_ringparam = tg3_get_ringparam,
.set_ringparam = tg3_set_ringparam,
- .get_pauseparam = tg3_get_pauseparam,
+ .get_pauseparamext = tg3_get_pauseparamext,
.set_pauseparam = tg3_set_pauseparam,
.self_test = tg3_self_test,
.get_strings = tg3_get_strings,
--
1.7.3.4
reply other threads:[~2011-10-14 20:54 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1318625642-9668-3-git-send-email-mcarlson@broadcom.com \
--to=mcarlson@broadcom.com \
--cc=bhutchings@solarflare.com \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).