diff options
| author | Ben Hutchings <bhutchings@solarflare.com> | 2012-02-29 14:23:27 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-03-01 16:41:22 -0500 |
| commit | 9c717758c9289331e22c88ef69d8c248def9cd29 (patch) | |
| tree | 316ed50fa343cb22f55a507dc2324d8287c4b673 | |
| parent | 48752f6513012a1b078da08b145d5c40a644f058 (diff) | |
| download | linux-3.10-9c717758c9289331e22c88ef69d8c248def9cd29.tar.gz linux-3.10-9c717758c9289331e22c88ef69d8c248def9cd29.tar.bz2 linux-3.10-9c717758c9289331e22c88ef69d8c248def9cd29.zip | |
mdio: Export mdio.h to userland
The ID packing definitions are needed by userland and the register
definitions may also be useful there.
Do not export mdio_phy_id_{is_c45,prtad,devad}() as the use of bool is
problematic and it's not that useful to export only a subset of these.
Do not export MDIO_SUPPORTS_{C22,C45} directly; these flags are only
exposed to userland through struct ethtool_cmd so they should be
defined alongside that with appropriate names.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | include/linux/Kbuild | 1 | ||||
| -rw-r--r-- | include/linux/mdio.h | 9 |
2 files changed, 5 insertions, 5 deletions
diff --git a/include/linux/Kbuild b/include/linux/Kbuild index c94e71781b7..4b0b7ed4a99 100644 --- a/include/linux/Kbuild +++ b/include/linux/Kbuild @@ -238,6 +238,7 @@ header-y += magic.h header-y += major.h header-y += map_to_7segment.h header-y += matroxfb.h +header-y += mdio.h header-y += media.h header-y += mempolicy.h header-y += meye.h diff --git a/include/linux/mdio.h b/include/linux/mdio.h index b1494aced21..ec90da7232c 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -273,6 +273,8 @@ static inline __u16 mdio_phy_id_c45(int prtad, int devad) return MDIO_PHY_ID_C45 | (prtad << 5) | devad; } +#ifdef __KERNEL__ + static inline bool mdio_phy_id_is_c45(int phy_id) { return (phy_id & MDIO_PHY_ID_C45) && !(phy_id & ~MDIO_PHY_ID_C45_MASK); @@ -288,11 +290,6 @@ static inline __u16 mdio_phy_id_devad(int phy_id) return phy_id & MDIO_PHY_ID_DEVAD; } -#define MDIO_SUPPORTS_C22 1 -#define MDIO_SUPPORTS_C45 2 - -#ifdef __KERNEL__ - /** * struct mdio_if_info - Ethernet controller MDIO interface * @prtad: PRTAD of the PHY (%MDIO_PRTAD_NONE if not present/unknown) @@ -321,6 +318,8 @@ struct mdio_if_info { #define MDIO_PRTAD_NONE (-1) #define MDIO_DEVAD_NONE (-1) +#define MDIO_SUPPORTS_C22 1 +#define MDIO_SUPPORTS_C45 2 #define MDIO_EMULATE_C22 4 struct ethtool_cmd; |