From 097b8fefa61da86f80c42196e74f1d5adf40e549 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Wed, 29 Apr 2009 08:19:36 +0000
Subject: [PATCH] --- yaml --- r: 150071 b: refs/heads/master c:
 af2a3eac2fe6a6d8e9fdf6927284b34466a7d808 h: refs/heads/master i:   150069:
 59c91d2a933c96fc3c2f4c39ebd6e2a5ce83fe26   150067:
 4da25b4ff3a59b608dccbae93dbbadc9cf6b4bcf   150063:
 f0b180744491563399be7665f38e93bd6842669e v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/net/mdio.c   | 30 ++++++++++++++++++++++++++++++
 trunk/include/linux/mdio.h |  3 +++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index ffa3a27bbb44..4c12828f6050 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8c30832b5b12e5d4e9d1c20cdac3cc2880e08b8
+refs/heads/master: af2a3eac2fe6a6d8e9fdf6927284b34466a7d808
diff --git a/trunk/drivers/net/mdio.c b/trunk/drivers/net/mdio.c
index 0604a25748ee..2fb0d16b61f7 100644
--- a/trunk/drivers/net/mdio.c
+++ b/trunk/drivers/net/mdio.c
@@ -274,6 +274,36 @@ void mdio45_ethtool_gset_npage(const struct mdio_if_info *mdio,
 }
 EXPORT_SYMBOL(mdio45_ethtool_gset_npage);
 
+/**
+ * mdio45_ethtool_spauseparam_an - set auto-negotiated pause parameters
+ * @mdio: MDIO interface
+ * @ecmd: Ethtool request structure
+ *
+ * This function assumes that the PHY has an auto-negotiation MMD.  It
+ * will enable and disable advertising of flow control as appropriate.
+ */
+void mdio45_ethtool_spauseparam_an(const struct mdio_if_info *mdio,
+				   const struct ethtool_pauseparam *ecmd)
+{
+	int adv, old_adv;
+
+	WARN_ON(!(mdio->mmds & MDIO_DEVS_AN));
+
+	old_adv = mdio->mdio_read(mdio->dev, mdio->prtad, MDIO_MMD_AN,
+				  MDIO_AN_ADVERTISE);
+	adv = old_adv & ~(ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM);
+	if (ecmd->autoneg)
+		adv |= mii_advertise_flowctrl(
+			(ecmd->rx_pause ? FLOW_CTRL_RX : 0) |
+			(ecmd->tx_pause ? FLOW_CTRL_TX : 0));
+	if (adv != old_adv) {
+		mdio->mdio_write(mdio->dev, mdio->prtad, MDIO_MMD_AN,
+				 MDIO_AN_ADVERTISE, adv);
+		mdio45_nway_restart(mdio);
+	}
+}
+EXPORT_SYMBOL(mdio45_ethtool_spauseparam_an);
+
 /**
  * mdio_mii_ioctl - MII ioctl interface for MDIO (clause 22 or 45) PHYs
  * @mdio: MDIO interface
diff --git a/trunk/include/linux/mdio.h b/trunk/include/linux/mdio.h
index ba41537eaa8a..5645c0f863dc 100644
--- a/trunk/include/linux/mdio.h
+++ b/trunk/include/linux/mdio.h
@@ -279,6 +279,9 @@ extern int mdio45_nway_restart(const struct mdio_if_info *mdio);
 extern void mdio45_ethtool_gset_npage(const struct mdio_if_info *mdio,
 				      struct ethtool_cmd *ecmd,
 				      u32 npage_adv, u32 npage_lpa);
+extern void
+mdio45_ethtool_spauseparam_an(const struct mdio_if_info *mdio,
+			      const struct ethtool_pauseparam *ecmd);
 
 /**
  * mdio45_ethtool_gset - get settings for ETHTOOL_GSET