diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-02-29 14:26:22 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-01 16:41:26 -0500 |
| commit | 9c4df53bc3f9c72d7f1f1226927f456d46412381 (patch) | |
| tree | 93bc7536bcf1cac679fc150d0cd88b9e21e5ed17 /drivers/net/mii.c | |
| parent | 9c717758c9289331e22c88ef69d8c248def9cd29 (diff) | |
ethtool, mdio, mii: Specify MDIO information fields in struct ethtool_cmd
Add comments for ethtool_cmd::phy_address and
ethtool_cmd::mdio_support, and definitions of the flags currently
used in mdio_support.
In the mdio library, assert that its own flags continue to match those
in the ethtool interface.
In the mii library, use the ethtool flag definition and stop
including <linux/mdio.h>.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/mii.c')
| -rw-r--r-- | drivers/net/mii.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/mii.c b/drivers/net/mii.c index c70c2332d15e..4a99c3919037 100644 --- a/drivers/net/mii.c +++ b/drivers/net/mii.c @@ -31,7 +31,7 @@ #include <linux/module.h> #include <linux/netdevice.h> #include <linux/ethtool.h> -#include <linux/mdio.h> +#include <linux/mii.h> static u32 mii_get_an(struct mii_if_info *mii, u16 addr) { @@ -74,7 +74,7 @@ int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd) /* this isn't fully supported at higher layers */ ecmd->phy_address = mii->phy_id; - ecmd->mdio_support = MDIO_SUPPORTS_C22; + ecmd->mdio_support = ETH_MDIO_SUPPORTS_C22; ecmd->advertising = ADVERTISED_TP | ADVERTISED_MII; |