Patchwork [PATCHv2,net-next,1/2] mdio: Export mdio.h to userland

login
register
mail settings
Submitter Ben Hutchings
Date March 1, 2012, 12:23 a.m.
Message ID <1330561407.5881.13.camel@bwh-desktop>
Download mbox | patch
Permalink /patch/143866/
State Accepted
Delegated to: David Miller
Headers show

Comments

Ben Hutchings - March 1, 2012, 12:23 a.m.
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>
---
 include/linux/Kbuild |    1 +
 include/linux/mdio.h |    9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
David Miller - March 1, 2012, 9:42 p.m.
From: Ben Hutchings <bhutchings@solarflare.com>
Date: Thu, 1 Mar 2012 00:23:27 +0000

> 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>

Applied, although I had to fixup trailing whitespace:

> +#ifdef __KERNEL__ 

here.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index c94e717..4b0b7ed 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 b1494ac..dec1e87 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;